Update of /cvsroot/audacity/audacity-src/locale
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv11859/locale
Modified Files:
Makefile.in
Log Message:
Fix installation and uninstallation using DESTDIR absolute paths
Index: Makefile.in
===================================================================
RCS file: /cvsroot/audacity/audacity-src/locale/Makefile.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Makefile.in 3 Jul 2007 21:57:48 -0000 1.17
+++ Makefile.in 3 Aug 2007 22:15:02 -0000 1.18
@@ -11,16 +11,24 @@
LINGUAS=af ar bn bg ca cs cy da de el es eu fi fr ga gl hu it ja ko lt mk nb
nl oc pl pt ro ru sk sl sv tr uk zh zh_TW
[EMAIL PROTECTED]@
-# this defaults to /usr/share
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
+# This is an intermediate directory that all files destined for installation
+# get put into on the way (make DESTDIR=/foo install).
[EMAIL PROTECTED]@
+# this is where locale-dependant stuff (i.e. .mo files) goes
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-ifdef DESTDIR
- INSTALL_PATH=$(top_srcdir)/$(DESTDIR)
-else
- INSTALL_PATH=
-endif
+
+# because we are in a subdirectory setting DESTDIR to a relative path doesn't
+# work - it gets interpreted relative to the locale directory in the source
+# tree. This is because relative DESTDIRs aren't supported. It could be worked
+# around by something along the lines of
+# if (DESTDIR is relative)
+# DESTDIR=$top_srcdir/DESTDIR
+# fi
+# but I can't see how to implement this. So for the moment stick to absolute
+# paths in DESTDIR
all: allmo
@@ -86,13 +94,13 @@
install: allmo
linguas='$(LINGUAS)'; for lang in $$linguas ; do \
- $(INSTALL) -d $(INSTALL_PATH)$(DATADIR)/locale/$$lang/LC_MESSAGES ; \
- $(INSTALL) -m 644 $$lang/audacity.mo
$(INSTALL_PATH)$(DATADIR)/locale/$$lang/LC_MESSAGES/$(AUDACITY_NAME).mo ; \
+ $(INSTALL) -d $(DESTDIR)$(LOCALEDIR)/$$lang/LC_MESSAGES ; \
+ $(INSTALL) -m 644 $$lang/audacity.mo
$(DESTDIR)$(LOCALEDIR)/$$lang/LC_MESSAGES/$(AUDACITY_NAME).mo ; \
done
uninstall:
linguas='$(LINGUAS)'; for lang in $$linguas ; do \
- rm -f $(DATADIR)/locale/$$lang/LC_MESSAGES/$(AUDACITY_NAME).mo ; \
+ rm -f $(DESTDIR)$(LOCALEDIR)/$$lang/LC_MESSAGES/$(AUDACITY_NAME).mo
; \
done
clean:
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
