This makes openais' pkgconfig/Makefile.am
a lot like the one in corosync.  This fixes a few problems
that were already fixed in corosync and makes one more:
don't remove all *.pc files, but only those that are generated.

>From 8102f3df1e46a69eaab18eefa6e7ef447ff40567 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyer...@redhat.com>
Date: Wed, 6 May 2009 09:08:59 +0200
Subject: [PATCH] pkgconfig/Makefile.am: missing dep fix; generate-read-only

* pkgconfig/Makefile.am: Merge fixes from corosync.
(clean-local): Remove rule.  Assign to CLEANFILES instead.
---
 pkgconfig/Makefile.am |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am
index b06ed74..a2eaf39 100644
--- a/pkgconfig/Makefile.am
+++ b/pkgconfig/Makefile.am
@@ -30,30 +30,30 @@

 MAINTAINERCLEANFILES   = Makefile.in

-LIBS   = saAmf saCkpt saClm saEvt saLck saMsg saTmr
+EXTRA_DIST = libtemplate.pc.in

-pkgconf_LIBS = $(LIBS:%=lib%)
+LIBS   = saAmf saCkpt saClm saEvt saLck saMsg saTmr

 target_LIBS = $(LIBS:%=lib%.pc)
+CLEANFILES = $(target_LIBS)

-lib%:
-       cat $(srcdir)/libtemplate.pc.in | sed \
+lib%.pc: libtemplate.pc.in Makefile
+       rm -f $...@-t $@
+       sed \
                -e 's...@prefix@#$(exec_prefix)#g' \
                -e 's...@libdir@#$(libdir)#g' \
                -e 's...@libversion@#$(VERSION)#g' \
-               -e 's...@lib@#'$(@:lib%=%)'#g' \
-       > $...@.pc;
-       touch $@
+               -e 's...@lib@#'$(*:lib%=%)'#g' \
+           $< > $...@-t
+       chmod a-w $...@-t
+       mv $...@-t $@

-all-local: $(pkgconf_LIBS)
+all-local: $(target_LIBS)

-install-exec-local:
+install-exec-local: $(target_LIBS)
        install -d $(DESTDIR)/$(libdir)/pkgconfig
        install -m 644 $(target_LIBS) $(DESTDIR)/$(libdir)/pkgconfig

 uninstall-local:
        cd $(DESTDIR)/$(libdir)/pkgconfig && rm -f $(target_LIBS)
        rmdir $(DESTDIR)/$(libdir)/pkgconfig 2> /dev/null || :
-
-clean-local:
-       rm -f *.pc $(pkgconf_LIBS)
--
1.6.3.rc4.206.g03e16
_______________________________________________
Openais mailing list
Openais@lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/openais

Reply via email to