https://issues.shibboleth.net/jira/browse/SSPCPP-570

[shibboleth/cpp-sp.git] / apache / Makefile.am

diff --git a/apache/Makefile.am b/apache/Makefile.am
index 4fd0f6e..4446359 100644 (file)
--- a/apache/Makefile.am
+++ b/apache/Makefile.am
@@ -1,62 +1,52 @@
 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_apache.cpp \
+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 \
        resource.h mod_shib_13.rc mod_shib_20.rc mod_shib_22.rc mod_shib_24.rc