gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-01-08 06:44:11 +01:00
Code Issues Projects Releases Wiki Activity

Simplify/fix pkgconfig installation

Browse Source 
Patch "Fix path substitutions" moved generation of pkgconfig files from
./configure to Makefiles. However the generation is not triggered since
the pkgconfig files are not listed as dependency. Fix by conversion to a
straightforward automake rule.

Acked-by: Brad Jorsch <anomie@users.sourceforge.net>
Signed-off-by: Andreas Metzler <ametzler@downhill.at.eu.org>
This commit is contained in:
Andreas Metzler
2010-10-16 15:59:41 +02:00
committed by Carlos R. Mafra
parent 76eab97209
commit 614eb4c9e8
2 changed files with 8 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
WINGs/Makefile.am
View File

@@ -86,7 +86,10 @@ AM_CFLAGS =
INCLUDES = -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \ INCLUDES = -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
@XFTFLAGS@ @HEADER_SEARCH_PATH@ @XFTFLAGS@ @HEADER_SEARCH_PATH@
DISTCLEANFILES = WINGs.pc get-wings-flags get-wutil-flags pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = WINGs.pc
DISTCLEANFILES = $(pkgconfig_DATA) get-wings-flags get-wutil-flags
WINGs.pc: Makefile WINGs.pc: Makefile
@echo "Generating $@" @echo "Generating $@"
@@ -114,12 +117,3 @@ get-wutil-flags: get-wutil-flags.in Makefile
-e 's#$${INTLIBS}#$(INTLIBS)#;' < $< > $@ -e 's#$${INTLIBS}#$(INTLIBS)#;' < $< > $@
@chmod 755 $@ @chmod 755 $@
install-exec-local:
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(libdir)/pkgconfig
@list='WINGs.pc'; for p in $$list; do \
if test -f $$p; then \
echo "$(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/pkgconfig/"; \
$(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/pkgconfig/; \
else :; fi; \
done

17
wrlib/Makefile.am
View File

@@ -49,7 +49,10 @@ INCLUDES = $(DFLAGS) @HEADER_SEARCH_PATH@
libwraster_la_LIBADD = @LIBRARY_SEARCH_PATH@ @GFXLIBS@ @XLIBS@ @LIBXMU@ -lm libwraster_la_LIBADD = @LIBRARY_SEARCH_PATH@ @GFXLIBS@ @XLIBS@ @LIBXMU@ -lm
DISTCLEANFILES = wrlib.pc get-wraster-flags pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = wrlib.pc
DISTCLEANFILES = $(pkgconfig_DATA) get-wraster-flags
wrlib.pc: Makefile wrlib.pc: Makefile
@echo "Generating $@" @echo "Generating $@"
@@ -67,15 +70,3 @@ get-wraster-flags: get-wraster-flags.in Makefile
-e 's#$${XLIBS}#$(XLIBS)#;' < $< > $@ -e 's#$${XLIBS}#$(XLIBS)#;' < $< > $@
@chmod 755 $@ @chmod 755 $@
install-exec-local:
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(libdir)/pkgconfig
@list='wrlib.pc'; for p in $$list; do \
if test -f $$p; then \
echo "$(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/pkgconfig/"; \
$(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/pkgconfig/; \
else :; fi; \
done