[PATCH] wmlib: Remove install-exec-local target.
Doug Torrance <[email protected]>
| Newsgroups | gmane.compw.window-managers.windowmaker.devel |
|---|---|
| Message-ID | <[email protected]> |
This was made redundant by defining pkgconfigdir and pkgconfig_DATA. On some systems (with automake < 1.15), this caused a build failure, e.g., [1]: /usr/bin/install -c -m 644 wmlib.pc /«BUILDDIR»/wmaker-0.95.7+201601230517/ debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig/ /usr/bin/install -c -m 644 wmlib.pc '/«BUILDDIR»/wmaker-0.95.7+201601230517/ debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig' /usr/bin/install: cannot create regular file '/«BUILDDIR»/ wmaker-0.95.7+201601230517/debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig/ wmlib.pc': File exists Also change the definition of DISTCLEANFILES to pkgconfig_DATA to match the Makefiles for WINGs and wrlib. [1] https://launchpadlibrarian.net/234989800/ buildlog_ubuntu-precise-amd64.wmaker_0.95.7+201601230517-0ppa201601211606~ ubuntu12.04.1_BUILDING.txt.gz --- wmlib/Makefile.am | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/wmlib/Makefile.am b/wmlib/Makefile.am index 9169aae..e134b3d 100644 --- a/wmlib/Makefile.am +++ b/wmlib/Makefile.am @@ -21,7 +21,7 @@ libWMaker_la_SOURCES = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = wmlib.pc -DISTCLEANFILES = wmlib.pc +DISTCLEANFILES = $(pkgconfig_DATA) wmlib.pc: Makefile @echo "Generating $@" @@ -31,13 +31,3 @@ wmlib.pc: Makefile @echo 'Requires: x11' >> $@ @echo 'Libs: $(lib_search_path) -lWMaker' >> $@ @echo 'Cflags: $(inc_search_path)' >> $@ - -install-exec-local: - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(libdir)/pkgconfig - @list='wmlib.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 -- 2.5.0 -- To unsubscribe, send mail to [email protected].