Author: rmeggins
Update of /cvs/dirsec/dsgw In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20908
Modified Files: Makefile.am Makefile.in Log Message: added perlpath for bundled installs
Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/dsgw/Makefile.am,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- Makefile.am 31 Jan 2008 22:48:17 -0000 1.14 +++ Makefile.am 31 Jan 2008 23:53:34 -0000 1.15 @@ -35,12 +35,19 @@ securitydir=$(instconfigdir)@securitydir@ # relative to $localstatedir cookiedir=$(localstatedir)@cookiedir@ -perldir = $(libdir)@perldir@ manualdir = $(datadir)@manualdir@ manualsubdir = @manualsubdir@ gwinfodir = $(manualdir)/en/$(manualsubdir)/info # this is the directory where the manuals will actually be installed maninstdir = $(manualdir)/en/$(manualsubdir) +perldir = $(libdir)@perldir@ + +# for a bundle, all of the components will be under libdir (e.g. prefix/lib) +if BUNDLE +perlpath=$(perldir) $(libdir)/perl/arch $(libdir)/perl +else +perlpath=$(perldir) +endif
DSGW_VER_STR := "Directory-Server-Gateway/$(PACKAGE_VERSION)"
Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/dsgw/Makefile.in,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- Makefile.in 31 Jan 2008 22:48:17 -0000 1.15 +++ Makefile.in 31 Jan 2008 23:53:34 -0000 1.16 @@ -393,6 +393,10 @@ gwinfodir = $(manualdir)/en/$(manualsubdir)/info # this is the directory where the manuals will actually be installed maninstdir = $(manualdir)/en/$(manualsubdir) +@BUNDLE_FALSE@perlpath = $(perldir) + +# for a bundle, all of the components will be under libdir (e.g. prefix/lib) +@BUNDLE_TRUE@perlpath = $(perldir) $(libdir)/perl/arch $(libdir)/perl DSGW_VER_STR := "Directory-Server-Gateway/$(PACKAGE_VERSION)" AM_CPPFLAGS = -DDSGW_VER_STR="$(DSGW_VER_STR)" $(DEBUG_DEFINES) \ @adminutil_inc@ @icu_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@ \