[llvm-commits] CVS: gcc-3.4/libstdc++-v3/po/Makefile.in

[John Criswell]

Changes in directory gcc-3.4/libstdc++-v3/po:

Makefile.in updated: 1.2 -> 1.3

---
Log message:

Commit of merge from September 24, 2003 of mainline GCC.  This merge now
works reasonably on Linux/x86 and probably works on Solaris/Sparc.



---
Diffs of the changes:  (+14 -14)

Index: gcc-3.4/libstdc++-v3/po/Makefile.in
diff -u gcc-3.4/libstdc++-v3/po/Makefile.in:1.2 gcc-3.4/libstdc++-v3/po/Makefile.in:1.3
--- gcc-3.4/libstdc++-v3/po/Makefile.in:1.2	Fri Jan  9 10:54:35 2004
+++ gcc-3.4/libstdc++-v3/po/Makefile.in	Thu Feb  5 10:05:49 2004
@@ -221,24 +221,24 @@
 
 # Location of installation directories.
 locale_installdir = $(DESTDIR)$(datadir)/locale
-locale_builddir = @glibcxx_localedir@
+locale_builddir = $(glibcxx_localedir)
 
 # Tell automake that foo.po makes foo.mo
 SUFFIXES = .po .mo
 
-LOCALE_IN = @glibcxx_POFILES@
-LOCALE_OUT = @glibcxx_MOFILES@
+LOCALE_IN = $(glibcxx_POFILES)
+LOCALE_OUT = $(glibcxx_MOFILES)
 
 MSGFMT = msgfmt
 
 # Necessary files.
 DISTFILES = \
 	Makefile.am Makefile.in string_literals.cc POTFILES.in $(PACKAGE).pot \
-	$(LOCALE_IN) 
+	$(LOCALE_IN)
 
 
 # Specify what gets cleaned up on a 'make clean'
-CLEANFILES = $(LOCALE_OUT) 
+CLEANFILES = $(LOCALE_OUT)
 subdir = po
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 CONFIG_HEADER = $(top_builddir)/config.h
@@ -392,15 +392,15 @@
 .po.mo:
 	$(MSGFMT) -o $@ $<
 
-all-local: all-local- at USE_NLS@
-all-local-no: 
-all-local-yes: $(LOCALE_OUT) 
+all-local: all-local-$(USE_NLS)
+all-local-no:
+all-local-yes: $(LOCALE_OUT)
 
 # 'make check' needs the catalogs constructed in build directory.
-check: check- at USE_NLS@
+check: check-$(USE_NLS)
 check-no:
 check-yes:
-	$(mkinstalldirs) $(locale_builddir) 
+	$(mkinstalldirs) $(locale_builddir)
 	catalogs='$(LOCALE_OUT)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
@@ -408,14 +408,14 @@
 	  install_dir=$(locale_builddir)/$$lang/LC_MESSAGES; \
 	  $(mkinstalldirs) $$install_dir; \
 	  $(INSTALL_DATA) $$cat $$install_dir/$(PACKAGE).mo; \
-	done 
+	done
 
-# Install rules here. 
+# Install rules here.
 # Wish install could just `cp -R ./share $(locale_installdir)` ...
-install-data-local: install-data-local- at USE_NLS@
+install-data-local: install-data-local-$(USE_NLS)
 install-data-local-no:
 install-data-local-yes: all-local-yes
-	$(mkinstalldirs) $(locale_installdir) 
+	$(mkinstalldirs) $(locale_installdir)
 	catalogs='$(LOCALE_OUT)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \