[cpp-sp COMMIT] in /branches/REL_2: adfs/Makefile.am apache/Makefile.am configs/Makefile.am doc/Makefile.am doxygen.a...

[noreply at shibboleth.net]

Author: scantor
Date: Tue May 22 02:32:08 2012
New Revision: 3675

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3675&view=rev
Log:
Fix install hooks and switch to PACKAGE_NAME macro.

Modified:
    branches/REL_2/adfs/Makefile.am
    branches/REL_2/apache/Makefile.am
    branches/REL_2/configs/Makefile.am
    branches/REL_2/doc/Makefile.am
    branches/REL_2/doxygen.am
    branches/REL_2/fastcgi/Makefile.am
    branches/REL_2/memcache-store/Makefile.am
    branches/REL_2/nsapi_shib/Makefile.am
    branches/REL_2/odbc-store/Makefile.am
    branches/REL_2/plugins/Makefile.am

Modified: branches/REL_2/adfs/Makefile.am
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/adfs/Makefile.am?rev=3675&r1=3674&r2=3675&view=diff
==============================================================================
--- branches/REL_2/adfs/Makefile.am (original)
+++ branches/REL_2/adfs/Makefile.am Tue May 22 02:32:08 2012
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign
 
-plugindir = $(libdir)/@PACKAGE@
+plugindir = $(libdir)/@PACKAGE_NAME@
 plugin_LTLIBRARIES = adfs.la adfs-lite.la
 
 adfs_la_LIBADD = $(XMLSEC_LIBS) \
@@ -19,7 +19,7 @@
 adfs_lite_la_LDFLAGS = -module -avoid-version
 adfs_lite_la_CPPFLAGS = -DSHIBSP_LITE
 
-install-exec-hook:
+install-data-hook:
 	for la in $(plugin_LTLIBRARIES) ; do rm -f $(DESTDIR)$(plugindir)/$$la ; done
 
 EXTRA_DIST = adfs.vcxproj adfs-lite.vcxproj resource.h adfs.rc

Modified: branches/REL_2/apache/Makefile.am
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/apache/Makefile.am?rev=3675&r1=3674&r2=3675&view=diff
==============================================================================
--- branches/REL_2/apache/Makefile.am (original)
+++ branches/REL_2/apache/Makefile.am Tue May 22 02:32:08 2012
@@ -1,60 +1,50 @@
 AUTOMAKE_OPTIONS = foreign
 
 if BUILD_AP13
-modshib13dir = $(libdir)/@PACKAGE@
+modshib13dir = $(libdir)/@PACKAGE_NAME@
 modshib13_LTLIBRARIES = mod_shib_13.la
 mod_shib_13_la_SOURCES = mod_shib_13.cpp
 mod_shib_13_la_CXXFLAGS = $(APXS_CFLAGS) -I$(APXS_INCLUDE)
 mod_shib_13_la_LDFLAGS = -module -avoid-version
 mod_shib_13_la_LIBADD = $(LITE_LIBS) \
   $(top_builddir)/shibsp/libshibsp-lite.la
-
-install-exec-hook:
-	for la in $(modshib13_LTLIBRARIES) ; do rm -f $(DESTDIR)$(modshib13dir)/$$la ; done
-
 endif
 
 if BUILD_AP20
-modshib20dir = $(libdir)/@PACKAGE@
+modshib20dir = $(libdir)/@PACKAGE_NAME@
 modshib20_LTLIBRARIES = mod_shib_20.la
 mod_shib_20_la_SOURCES = mod_shib_20.cpp
 mod_shib_20_la_CXXFLAGS = $(APXS2_CFLAGS) -I$(APXS2_INCLUDE)
 mod_shib_20_la_LDFLAGS = -module -avoid-version
 mod_shib_20_la_LIBADD = $(LITE_LIBS) \
   $(top_builddir)/shibsp/libshibsp-lite.la
-
-install-exec-hook:
-	for la in $(modshib20_LTLIBRARIES) ; do rm -f $(DESTDIR)$(modshib20dir)/$$la ; done
-
 endif
 
 if BUILD_AP22
-modshib22dir = $(libdir)/@PACKAGE@
+modshib22dir = $(libdir)/@PACKAGE_NAME@
 modshib22_LTLIBRARIES = mod_shib_22.la
 mod_shib_22_la_SOURCES = mod_shib_22.cpp
 mod_shib_22_la_CXXFLAGS = $(APXS22_CFLAGS) -I$(APXS22_INCLUDE)
 mod_shib_22_la_LDFLAGS = -module -avoid-version
 mod_shib_22_la_LIBADD = $(LITE_LIBS) \
   $(top_builddir)/shibsp/libshibsp-lite.la
-
-install-exec-hook:
-	for la in $(modshib22_LTLIBRARIES) ; do rm -f $(DESTDIR)$(modshib22dir)/$$la ; done
-
 endif
 
 if BUILD_AP24
-modshib24dir = $(libdir)/@PACKAGE@
+modshib24dir = $(libdir)/@PACKAGE_NAME@
 modshib24_LTLIBRARIES = mod_shib_24.la
 mod_shib_24_la_SOURCES = mod_shib_24.cpp
 mod_shib_24_la_CXXFLAGS = $(APXS24_CFLAGS) -I$(APXS24_INCLUDE)
 mod_shib_24_la_LDFLAGS = -module -avoid-version
 mod_shib_24_la_LIBADD = $(LITE_LIBS) \
   $(top_builddir)/shibsp/libshibsp-lite.la
+endif
 
-install-exec-hook:
+install-data-hook:
+	for la in $(modshib13_LTLIBRARIES) ; do rm -f $(DESTDIR)$(modshib13dir)/$$la ; done
+	for la in $(modshib20_LTLIBRARIES) ; do rm -f $(DESTDIR)$(modshib20dir)/$$la ; done
+	for la in $(modshib22_LTLIBRARIES) ; do rm -f $(DESTDIR)$(modshib22dir)/$$la ; done
 	for la in $(modshib24_LTLIBRARIES) ; do rm -f $(DESTDIR)$(modshib24dir)/$$la ; done
-
-endif
 
 EXTRA_DIST = mod_shib.cpp \
 	mod_shib_13.cpp mod_shib_20.cpp mod_shib_22.cpp mod_shib_24.cpp \

Modified: branches/REL_2/configs/Makefile.am
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/configs/Makefile.am?rev=3675&r1=3674&r2=3675&view=diff
==============================================================================
--- branches/REL_2/configs/Makefile.am (original)
+++ branches/REL_2/configs/Makefile.am Tue May 22 02:32:08 2012
@@ -2,14 +2,14 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-pkglibdir = ${libdir}/@PACKAGE@
-pkglogdir = ${localstatedir}/log/@PACKAGE@
+pkglibdir = ${libdir}/@PACKAGE_NAME@
+pkglogdir = ${localstatedir}/log/@PACKAGE_NAME@
 shirelogdir = ${localstatedir}/log/httpd
-pkgxmldir = $(datadir)/xml/@PACKAGE@
-pkgwebdir = $(datadir)/@PACKAGE@
-pkgrundir = $(localstatedir)/run/@PACKAGE@
-pkgcachedir = $(localstatedir)/cache/@PACKAGE@
-pkgsysconfdir = $(sysconfdir)/@PACKAGE@
+pkgxmldir = $(datadir)/xml/@PACKAGE_NAME@
+pkgwebdir = $(datadir)/@PACKAGE_NAME@
+pkgrundir = $(localstatedir)/run/@PACKAGE_NAME@

[... 231 lines stripped ...]