include/Makefile.am:
- move openais headers back to /usr/include/openais
services/Makefile.am:
- ship aisexec shell wrapper
- build and ship openais-instantiate
configure.ac:
- fix shell expansion and distcheck.
pkgconfig:
- drop openais.pc.in (not required)
- update libtemplate.pc.in to match headers location
Makefile.am:
- ship amf.conf
Fabio
Index: include/Makefile.am
===================================================================
--- include/Makefile.am (revision 1843)
+++ include/Makefile.am (working copy)
@@ -26,4 +26,6 @@
noinst_HEADERS = $(OPENAIS_INTERNAL_H)
-nobase_include_HEADERS = $(OPENAIS_H)
+openais_includedir = ${includedir}/openais
+
+openais_include_HEADERS = $(OPENAIS_H)
Index: services/Makefile.am
===================================================================
--- services/Makefile.am (revision 1843)
+++ services/Makefile.am (working copy)
@@ -45,7 +45,7 @@
SOURCES = $(SERVICE_LCRSO:%=%.c) $(src) openaisserviceenable.c openaisparser.c
-EXTRA_DIST = $(SOURCES)
+EXTRA_DIST = $(SOURCES) aisexec
LCRSO = $(SERVICE_LCRSO:%=service_%.lcrso) $(REGULAR_LCRSO:%=%.lcrso) service_amf.lcrso
@@ -53,6 +53,10 @@
noinst_HEADERS = clm.h amf.h
+sbin_SCRIPTS = aisexec
+
+sbin_PROGRAMS = openais-instantiate
+
if BUILD_DARWIN
service_amf.lcrso: $(AMF_OBJECTS)
$(CC) $(CFLAGS) -bundle -bundle_loader /usr/sbin/corosync $^ -o $@
Index: configure.ac
===================================================================
--- configure.ac (revision 1843)
+++ configure.ac (working copy)
@@ -178,7 +178,7 @@
AC_ARG_WITH([lcrso-dir],
[ --with-lcrso-dir=DIR : corosync lcrso files. ],
[ LCRSODIR="$withval" ],
- [ LCRSODIR="${pkg_cv_lcrsodir}" ])
+ [ LCRSODIR="\${exec_prefix}${pkg_cv_lcrsodir}" ])
# OS detection
# THIS SECTION MUST DIE!
Index: pkgconfig/openais.pc.in
===================================================================
--- pkgconfig/openais.pc.in (revision 1843)
+++ pkgconfig/openais.pc.in (working copy)
@@ -1,9 +0,0 @@
-pref...@prefix@
-exec_prefix=${prefix}
-libd...@libdir@
-includedir=${prefix}/include
-
-Name: openais
-Version: @LIBVERSION@
-Description: openais
-Requires:
Index: pkgconfig/libtemplate.pc.in
===================================================================
--- pkgconfig/libtemplate.pc.in (revision 1843)
+++ pkgconfig/libtemplate.pc.in (working copy)
@@ -1,7 +1,7 @@
pref...@prefix@
exec_prefix=${prefix}
libd...@libdir@
-includedir=${prefix}/include
+includedir=${prefix}/include/openais
Name: @LIB@
Version: @LIBVERSION@
Index: pkgconfig/Makefile.am
===================================================================
--- pkgconfig/Makefile.am (revision 1843)
+++ pkgconfig/Makefile.am (working copy)
@@ -36,8 +36,6 @@
target_LIBS = $(LIBS:%=lib%.pc)
-target_PACKAGE = openais.pc
-
lib%:
cat $(srcdir)/libtemplate.pc.in | sed \
-e 's...@prefix@#$(exec_prefix)#g' \
@@ -47,21 +45,14 @@
> [email protected];
touch $@
-$(target_PACKAGE):
- cat $(srcdir)/[email protected] | sed \
- -e 's...@prefix@#$(exec_prefix)#g' \
- -e 's...@libdir@#$(libdir)#g' \
- -e 's...@libversion@#$(VERSION)#g'
- > $@
+all-local: $(pkgconf_LIBS)
-all-local: $(pkgconf_LIBS) $(target_PACKAGE)
-
install-exec-local:
install -d $(DESTDIR)/$(libdir)/pkgconfig
- install -m 644 $(target_LIBS) $(target_PACKAGE) $(DESTDIR)/$(libdir)/pkgconfig
+ install -m 644 $(target_LIBS) $(DESTDIR)/$(libdir)/pkgconfig
uninstall-local:
- cd $(DESTDIR)/$(libdir)/pkgconfig && rm -f $(target_LIBS) $(target_PACKAGE)
+ cd $(DESTDIR)/$(libdir)/pkgconfig && rm -f $(target_LIBS)
rmdir $(DESTDIR)/$(libdir)/pkgconfig 2> /dev/null || :
clean-local:
Index: Makefile.am
===================================================================
--- Makefile.am (revision 1843)
+++ Makefile.am (working copy)
@@ -38,7 +38,7 @@
dist_doc_DATA = LICENSE README.amf AUTHORS
-sysconf_DATA = conf/openais.conf
+sysconf_DATA = conf/openais.conf conf/amf.conf
SUBDIRS = include lib services test pkgconfig man
# init
_______________________________________________
Openais mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/openais
