From 5ff0272508b481bf4bd136f9108275c97e75287d Mon Sep 17 00:00:00 2001 From: Brad Jorsch Date: Sun, 17 Oct 2010 17:33:39 -0400 Subject: [PATCH] Fix pkgdatadir The previous patch "Fix path substitutions" accidentally caused autoconf to overwrite automake's pkgdatadir. Since configure.ac does absolutely nothing interesting with pkgdatadir anyway, just remove it completely. Signed-off-by: Brad Jorsch --- Makefile.am | 2 +- configure.ac | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index c75cb24a..5f1700d5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,7 @@ config-paths.h: Makefile @echo '#define PIXMAPDIR "$(pixmapdir)"' >> $@ @echo '' >> $@ @echo '/* where shared data is stored */' >> $@ - @echo '#define PKGDATADIR "$(pkgdatadir)/WindowMaker"' >> $@ + @echo '#define PKGDATADIR "$(datadir)/WindowMaker"' >> $@ @echo '' >> $@ @echo '/* where the configuration is stored */' >> $@ @echo '#define SYSCONFDIR "$(sysconfdir)"' >> $@ diff --git a/configure.ac b/configure.ac index 15145fd9..5714e04c 100644 --- a/configure.ac +++ b/configure.ac @@ -820,9 +820,6 @@ else fi AC_SUBST(pixmapdir) -pkgdatadir='${datadir}' -AC_SUBST(pkgdatadir) - dnl Support for GNUSTEP_LOCAL_ROOT, for WPrefs.app dnl ==============================================