Readd pkgconfig subdir to the build system and port it

to autoconf


git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1832 fd59a12c-fef9-0310-b244-a6a79926bd2f

Makefile.am

@@ -38,7 +38,7 @@ MAINTAINERCLEANFILES    = Makefile.in aclocal.m4 configure depcomp \
 
 ETCDIR = /etc
 MANDIR = /usr/share/man
-SUBDIRS	= include lcr lib exec services tools test 
+SUBDIRS	= include lcr lib exec services tools test pkgconfig
 # man init conf
 
 lint:

configure.in

@@ -530,6 +530,7 @@ exec/Makefile							\
 test/Makefile							\
 tools/Makefile							\
 services/Makefile						\
+pkgconfig/Makefile						\
 		)
 
 dnl Now process the entire list of files added by previous 

pkgconfig/Makefile → pkgconfig/Makefile.am

@@ -28,23 +28,28 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 # THE POSSIBILITY OF SUCH DAMAGE.
 
-# Include configuration
-#
-srcdir ?= $(CURDIR)/../
-subdir ?= pkgconfig
-
-include $(srcdir)/Makefile.inc
+MAINTAINERCLEANFILES	= Makefile.in
 
 LIBS = evs cpg cfg coroutil confdb quorum votequorum totem_pg logsys
 
-all:
-	for i in $(LIBS); do \
-		cat ${srcdir}/pkgconfig/libtemplate.pc.in | sed \
-			-e 's#@PREFIX@#$(PREFIX)#g' \
-			-e 's#@LIBDIR@#$(LIBDIR)#g' \
-			-e 's#@LIB@#'$${i}'#g' \
-		> lib$${i}.pc; \
-	done;
-
-clean:
-	rm -f *.pc
+pkgconf_LIBS = $(LIBS:%=lib%)
+
+target_LIBS = $(LIBS:%=lib%.pc)
+
+lib%:
+	cat $(srcdir)/libtemplate.pc.in | sed \
+		-e 's#@PREFIX@#$(exec_prefix)#g' \
+		-e 's#@LIBDIR@#$(libdir)#g' \
+		-e 's#@LIBVERSION@#$(VERSION)#g' \
+		-e 's#@LIB@#'$@'#g' \
+	> $@.pc;
+	touch $@
+
+all-local: $(pkgconf_LIBS)
+
+install-exec-local:
+	install -d $(DESTDIR)/$(libdir)/pkgconfig
+	install -m 644 $(target_LIBS) $(DESTDIR)/$(libdir)/pkgconfig
+
+clean-local:
+	rm -f *.pc $(pkgconf_LIBS)

pkgconfig/libtemplate.pc.in

@@ -4,7 +4,7 @@ libdir=@LIBDIR@
 includedir=${prefix}/include
 
 Name: @LIB@
-Version: trunk
+Version: @LIBVERSION@
 Description: @LIB@
 Requires:
 Libs: -L${libdir} -l@LIB@