[repo.or.cz] wmaker-crm.git branch next updated: wmaker-0.95.7-37-gbf6f814

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project wmaker-crm.git.

The branch, next has been updated
       via  bf6f81434be465aaa4984a8220e0de432d00837b (commit)
      from  af892d7dd60219f6165e1534a7c3b97d252c448f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://repo.or.cz/wmaker-crm.git/commit/bf6f81434be465aaa4984a8220e0de432d00837b

commit bf6f81434be465aaa4984a8220e0de432d00837b
Author: Doug Torrance <[email protected]>
Date:   Sat Jan 23 08:55:45 2016 -0500

    wmlib: Remove install-exec-local target.
    
    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

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

-----------------------------------------------------------------------

Summary of changes:
 wmlib/Makefile.am | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)


repo.or.cz automatic notification. Contact project admin [email protected]
if you want to unsubscribe, or site admin [email protected] if you receive
no reply.
-- 
wmaker-crm.git ("The Window Maker window manager")


-- 
To unsubscribe, send mail to [email protected].