gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-28 17:32:29 +01:00
Code Issues Projects Releases Wiki Activity

Fix pkgdatadir

Browse Source 
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 <anomie@users.sourceforge.net>
This commit is contained in:
Brad Jorsch
2010-10-17 17:33:39 -04:00
committed by Carlos R. Mafra
parent 1060f49366
commit 5ff0272508
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@@ -24,7 +24,7 @@ config-paths.h: Makefile
@echo '#define PIXMAPDIR "$(pixmapdir)"' >> $@ @echo '#define PIXMAPDIR "$(pixmapdir)"' >> $@
@echo '' >> $@ @echo '' >> $@
@echo '/* where shared data is stored */' >> $@ @echo '/* where shared data is stored */' >> $@
@echo '#define PKGDATADIR "$(pkgdatadir)/WindowMaker"' >> $@ @echo '#define PKGDATADIR "$(datadir)/WindowMaker"' >> $@
@echo '' >> $@ @echo '' >> $@
@echo '/* where the configuration is stored */' >> $@ @echo '/* where the configuration is stored */' >> $@
@echo '#define SYSCONFDIR "$(sysconfdir)"' >> $@ @echo '#define SYSCONFDIR "$(sysconfdir)"' >> $@

3
configure.ac
View File

@@ -820,9 +820,6 @@ else
fi fi
AC_SUBST(pixmapdir) AC_SUBST(pixmapdir)
pkgdatadir='${datadir}'
AC_SUBST(pkgdatadir)
dnl Support for GNUSTEP_LOCAL_ROOT, for WPrefs.app dnl Support for GNUSTEP_LOCAL_ROOT, for WPrefs.app
dnl ============================================== dnl ==============================================