Fix install hooks and switch to PACKAGE_NAME macro.

git-svn-id: https://svn.shibboleth.net/cpp-sp/branches/REL_2@3675 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/adfs/Makefile.am b/adfs/Makefile.am
index cd3ade5..4600665 100644 (file)
--- a/adfs/Makefile.am
+++ b/adfs/Makefile.am
@@ -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_la_LDFLAGS = -module -avoid-version
 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

diff --git a/apache/Makefile.am b/apache/Makefile.am
index 52f2a1c..4446359 100644 (file)
--- a/apache/Makefile.am
+++ b/apache/Makefile.am
@@ -1,61 +1,51 @@
 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 \
        mod_shib13.vcxproj mod_shib20.vcxproj mod_shib22.vcxproj mod_shib24.vcxproj \

diff --git a/configs/Makefile.am b/configs/Makefile.am
index a86c8ba..30d2fc6 100644 (file)
--- a/configs/Makefile.am
+++ b/configs/Makefile.am
@@ -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@
+pkgcachedir = $(localstatedir)/cache/@PACKAGE_NAME@
+pkgsysconfdir = $(sysconfdir)/@PACKAGE_NAME@
 pkgsysconf_DATA = \
        shibd-redhat \
        shibd-suse \

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 0c3c93b..0e2b83b 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign
 
-pkgdocdir = $(datadir)/doc/@PACKAGE@-@PACKAGE_VERSION@
-pkgwebdir = $(datadir)/@PACKAGE@
+pkgdocdir = $(datadir)/doc/@PACKAGE_NAME@-@PACKAGE_VERSION@
+pkgwebdir = $(datadir)/@PACKAGE_NAME@
 
 install-data-hook:
        if test -d api ; then \

diff --git a/doxygen.am b/doxygen.am
index f6f505a..a03a628 100644 (file)
--- a/doxygen.am
+++ b/doxygen.am
@@ -54,7 +54,7 @@ DX_CLEAN_CHM = @DX_DOCDIR@/chm
 
 if DX_COND_chi
 
-DX_CLEAN_CHI = @DX_DOCDIR@/@PACKAGE@.chi
+DX_CLEAN_CHI = @DX_DOCDIR@/@PACKAGE_NAME@.chi
 
 endif DX_COND_chi
 
@@ -96,13 +96,13 @@ endif DX_COND_xml
 
 if DX_COND_ps
 
-DX_CLEAN_PS = @DX_DOCDIR@/@PACKAGE@.ps
+DX_CLEAN_PS = @DX_DOCDIR@/@PACKAGE_NAME@.ps
 
 DX_PS_GOAL = doxygen-ps
 
-doxygen-ps: @DX_DOCDIR@/@PACKAGE@.ps
+doxygen-ps: @DX_DOCDIR@/@PACKAGE_NAME@.ps
 
-@DX_DOCDIR@/@PACKAGE@.ps: @DX_DOCDIR@/@PACKAGE@.tag
+@DX_DOCDIR@/@PACKAGE_NAME@.ps: @DX_DOCDIR@/@PACKAGE_NAME@.tag
        cd @DX_DOCDIR@/latex; \
        rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \
        $(DX_LATEX) refman.tex; \
@@ -115,7 +115,7 @@ doxygen-ps: @DX_DOCDIR@/@PACKAGE@.ps
            $(DX_LATEX) refman.tex; \
            countdown=`expr $$countdown - 1`; \
        done; \
-       $(DX_DVIPS) -o ../@PACKAGE@.ps refman.dvi
+       $(DX_DVIPS) -o ../@PACKAGE_NAME@.ps refman.dvi
 
 endif DX_COND_ps
 
@@ -125,13 +125,13 @@ endif DX_COND_ps
 
 if DX_COND_pdf
 
-DX_CLEAN_PDF = @DX_DOCDIR@/@PACKAGE@.pdf
+DX_CLEAN_PDF = @DX_DOCDIR@/@PACKAGE_NAME@.pdf
 
 DX_PDF_GOAL = doxygen-pdf
 
-doxygen-pdf: @DX_DOCDIR@/@PACKAGE@.pdf
+doxygen-pdf: @DX_DOCDIR@/@PACKAGE_NAME@.pdf
 
-@DX_DOCDIR@/@PACKAGE@.pdf: @DX_DOCDIR@/@PACKAGE@.tag
+@DX_DOCDIR@/@PACKAGE_NAME@.pdf: @DX_DOCDIR@/@PACKAGE_NAME@.tag
        cd @DX_DOCDIR@/latex; \
        rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \
        $(DX_PDFLATEX) refman.tex; \
@@ -144,7 +144,7 @@ doxygen-pdf: @DX_DOCDIR@/@PACKAGE@.pdf
            $(DX_PDFLATEX) refman.tex; \
            countdown=`expr $$countdown - 1`; \
        done; \
-       mv refman.pdf ../@PACKAGE@.pdf
+       mv refman.pdf ../@PACKAGE_NAME@.pdf
 
 endif DX_COND_pdf
 
@@ -162,16 +162,16 @@ endif DX_COND_latex
 
 .INTERMEDIATE: doxygen-run $(DX_PS_GOAL) $(DX_PDF_GOAL)
 
-doxygen-run: @DX_DOCDIR@/@PACKAGE@.tag
+doxygen-run: @DX_DOCDIR@/@PACKAGE_NAME@.tag
 
 doxygen-doc: doxygen-run $(DX_PS_GOAL) $(DX_PDF_GOAL)
 
-@DX_DOCDIR@/@PACKAGE@.tag: $(DX_CONFIG) $(pkginclude_HEADERS)
+@DX_DOCDIR@/@PACKAGE_NAME@.tag: $(DX_CONFIG) $(pkginclude_HEADERS)
        rm -rf @DX_DOCDIR@
        $(DX_ENV) DX_INCLUDE=$(DX_INCLUDE) $(DX_DOXYGEN) $(srcdir)/$(DX_CONFIG)
 
 DX_CLEANFILES = \
-    @DX_DOCDIR@/@PACKAGE@.tag \
+    @DX_DOCDIR@/@PACKAGE_NAME@.tag \
     -r \
     $(DX_CLEAN_HTML) \
     $(DX_CLEAN_CHM) \

diff --git a/fastcgi/Makefile.am b/fastcgi/Makefile.am
index 134aabf..a1df92e 100644 (file)
--- a/fastcgi/Makefile.am
+++ b/fastcgi/Makefile.am
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign
 
 if BUILD_FASTCGI
 
-fastcgidir = $(libdir)/@PACKAGE@
+fastcgidir = $(libdir)/@PACKAGE_NAME@
 
 fastcgi_PROGRAMS = shibauthorizer shibresponder
 

diff --git a/memcache-store/Makefile.am b/memcache-store/Makefile.am
index d1c4286..7928576 100644 (file)
--- a/memcache-store/Makefile.am
+++ b/memcache-store/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign
 
-plugindir = $(libdir)/@PACKAGE@
+plugindir = $(libdir)/@PACKAGE_NAME@
 plugin_LTLIBRARIES = memcache-store.la
 
 AM_CFLAGS = $(MEMCACHED_CFLAGS)
@@ -13,7 +13,7 @@ memcache_store_la_SOURCES = \
 
 memcache_store_la_LDFLAGS = -module -avoid-version
 
-install-exec-hook:
+install-data-hook:
        for la in $(plugin_LTLIBRARIES) ; do rm -f $(DESTDIR)$(plugindir)/$$la ; done
 
 EXTRA_DIST = memcache-store.vcxproj memcache-store.rc resource.h

diff --git a/nsapi_shib/Makefile.am b/nsapi_shib/Makefile.am
index f9af5b5..32827a4 100644 (file)
--- a/nsapi_shib/Makefile.am
+++ b/nsapi_shib/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign
 
 if BUILD_NSAPI
-nsapi_shibdir = $(libdir)/@PACKAGE@
+nsapi_shibdir = $(libdir)/@PACKAGE_NAME@
 nsapi_shib_LTLIBRARIES = nsapi_shib.la
 nsapi_shib_la_SOURCES = nsapi_shib.cpp
 nsapi_shib_la_CXXFLAGS = $(NSAPI_INCLUDE)
@@ -9,7 +9,7 @@ nsapi_shib_la_LDFLAGS = -module -avoid-version
 nsapi_shib_la_LIBADD = $(LITE_LIBS) \
   $(top_builddir)/shibsp/libshibsp-lite.la
 
-install-exec-hook:
+install-data-hook:
        for la in $(nsapi_shib_LTLIBRARIES) ; do rm -f $(DESTDIR)$(nsapi_shibdir)/$$la ; done
 
 endif

diff --git a/odbc-store/Makefile.am b/odbc-store/Makefile.am
index 2d01685..2593ace 100644 (file)
--- a/odbc-store/Makefile.am
+++ b/odbc-store/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign
 
-plugindir = $(libdir)/@PACKAGE@
+plugindir = $(libdir)/@PACKAGE_NAME@
 plugin_LTLIBRARIES = odbc-store.la
 
 AM_CFLAGS = $(ODBC_CFLAGS)
@@ -13,7 +13,7 @@ odbc_store_la_SOURCES = \
 
 odbc_store_la_LDFLAGS = -module -avoid-version
 
-install-exec-hook:
+install-data-hook:
        for la in $(plugin_LTLIBRARIES) ; do rm -f $(DESTDIR)$(plugindir)/$$la ; done
 
 EXTRA_DIST = odbc-store.vcxproj odbc-store.rc resource.h

diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 1c03b16..c97e828 100644 (file)
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign
 
-plugindir = $(libdir)/@PACKAGE@
+plugindir = $(libdir)/@PACKAGE_NAME@
 plugin_LTLIBRARIES = plugins.la
 
 noinst_HEADERS = \
@@ -11,10 +11,10 @@ common_sources = \
 
 plugins_la_SOURCES = \
        ${common_sources} \
-    CaseFoldingAttributeResolver.cpp \
+       CaseFoldingAttributeResolver.cpp \
        GSSAPIAttributeExtractor.cpp \
-    TemplateAttributeResolver.cpp \
-    TransformAttributeResolver.cpp
+       TemplateAttributeResolver.cpp \
+       TransformAttributeResolver.cpp
 
 #plugins_lite_la_SOURCES = \
 #      ${common_sources}
@@ -29,7 +29,7 @@ plugins_la_LDFLAGS = -module -avoid-version
 #plugins_lite_la_LDFLAGS = -module -avoid-version
 #plugins_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 = plugins.vcxproj resource.h plugins.rc