Variable `pkgdatadir' is set by autoconf and defaults to
${datadir}/${PACKAGE}. Do not override it, this breaks
`install' target.
Signed-off-by: Alexey I. Froloff <[email protected]>
---
Makefile.am | 4 ++--
configure.ac | 4 ----
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index c75cb24..f82a77c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,7 +15,7 @@ config-paths.h: Makefile
@echo '' >> $@
@echo '/* gettext domain used for menu translations */' >> $@
@if test -z "$(menutextdomain)"; then \
- echo '/* #undef MENU_TEXTDOMAIN "$(menutextdomain)" */' >> $@; \
+ echo '/* #undef MENU_TEXTDOMAIN */' >> $@; \
else \
echo '#define MENU_TEXTDOMAIN "$(menutextdomain)"' >> $@; \
fi
@@ -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 "$(pkgdatadir)"' >> $@
@echo '' >> $@
@echo '/* where the configuration is stored */' >> $@
@echo '#define SYSCONFDIR "$(sysconfdir)"' >> $@
diff --git a/configure.ac b/configure.ac
index 15145fd..6dea01f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -820,10 +820,6 @@ else
fi
AC_SUBST(pixmapdir)
-pkgdatadir='${datadir}'
-AC_SUBST(pkgdatadir)
-
-
dnl Support for GNUSTEP_LOCAL_ROOT, for WPrefs.app
dnl ==============================================
--
1.7.2.3
--
To unsubscribe, send mail to [email protected].
