summaryrefslogtreecommitdiffstats
path: root/pki/base/tps/Makefile.am
diff options
context:
space:
mode:
authormharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2010-01-21 23:17:26 +0000
committermharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2010-01-21 23:17:26 +0000
commit67ee705eafd9fb655f61732ba3c8ec2c869a409e (patch)
treed711e76cbd24198cb1247c2c72bbe72e7f40cb4d /pki/base/tps/Makefile.am
parent77677d528c57e0648ee149176fa87447c25292b0 (diff)
downloadpki-67ee705eafd9fb655f61732ba3c8ec2c869a409e.tar.gz
pki-67ee705eafd9fb655f61732ba3c8ec2c869a409e.tar.xz
pki-67ee705eafd9fb655f61732ba3c8ec2c869a409e.zip
Bugzilla Bug #512234 - Move pkiuser:pkiuser check from spec file into pkicreate . . .
Bugzilla Bug #547471 - Apply PKI SELinux changes to PKI registry model Bugzilla Bug #553076 - Apply "registry" logic to pki-ra . . . Bugzilla Bug #553078 - Apply "registry" logic to pki-tps . . . git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@933 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base/tps/Makefile.am')
-rw-r--r--pki/base/tps/Makefile.am10
1 files changed, 4 insertions, 6 deletions
diff --git a/pki/base/tps/Makefile.am b/pki/base/tps/Makefile.am
index c13bc5802..68930d873 100644
--- a/pki/base/tps/Makefile.am
+++ b/pki/base/tps/Makefile.am
@@ -183,7 +183,7 @@ docroot_tps_img_DATA =
docroot_tps_js_DATA =
-initd_SCRIPTS = $(srcdir)/etc/init.d/httpd
+initd_SCRIPTS = $(srcdir)/etc/init.d/pki-tpsd
license_DATA = $(srcdir)/LICENSE
@@ -250,8 +250,6 @@ if LINUX
setup_DATA = $(srcdir)/setup/config.desktop
endif
-setup_SCRIPTS = $(srcdir)/setup/postinstall
-
templates_DATA = $(srcdir)/apache/pki_instance_command_wrapper \
$(srcdir)/apache/pki_subsystem_command_wrapper
@@ -269,7 +267,7 @@ libtokendb_la_SOURCES = src/tus/tus_db.c
libtokendb_la_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @svrcore_inc@ \
@sasl_inc@ @nss_inc@ @nspr_inc@
-libtokendb_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version
+libtokendb_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(GENERIC_LIBRARY_VERSION) --release $(VERSION)
libtokendb_la_LIBADD = $(LDAPSDK_LINK) $(SVRCORE_LINK) \
$(SASL_LINK) $(NSS_LINK) $(NSPR_LINK) $(LIBNSL) $(LIBSOCKET) $(LIBDL) \
$(LIBCSTD) $(LIBCRUN)
@@ -362,7 +360,7 @@ libtps_la_SOURCES = src/main/Buffer.cpp \
libtps_la_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @svrcore_inc@ \
@sasl_inc@ @nss_inc@ @nspr_inc@
-libtps_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version
+libtps_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(GENERIC_LIBRARY_VERSION) --release $(VERSION)
libtps_la_LIBADD = ${top_builddir}/libtokendb.la $(LDAPSDK_LINK) \
$(SVRCORE_LINK) $(SASL_LINK) $(NSS_LINK) $(NSPR_LINK) $(LIBNSL) \
$(LIBSOCKET) $(LIBDL) $(LIBCSTD) $(LIBCRUN)
@@ -375,7 +373,7 @@ libldapauth_la_SOURCES = src/authentication/LDAP_Authentication.cpp
libldapauth_la_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @svrcore_inc@ \
@sasl_inc@ @nss_inc@ @nspr_inc@
-libldapauth_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version
+libldapauth_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(GENERIC_LIBRARY_VERSION) --release $(VERSION)
libldapauth_la_LIBADD = ${top_builddir}/libtps.la $(LDAPSDK_LINK) \
$(SVRCORE_LINK) $(SASL_LINK) $(NSS_LINK) $(NSPR_LINK) $(LIBNSL) \
$(LIBSOCKET) $(LIBDL) $(LIBCSTD) $(LIBCRUN)