[Opensrf-commits] r1415 - branches/sboyette/src

[svn at svn.open-ils.org]

Author: sboyette
Date: 2008-08-13 13:17:37 -0400 (Wed, 13 Aug 2008)
New Revision: 1415

Modified:
   branches/sboyette/src/Makefile.am
Log:
perl install stuffs


Modified: branches/sboyette/src/Makefile.am
===================================================================
--- branches/sboyette/src/Makefile.am	2008-08-13 16:45:38 UTC (rev 1414)
+++ branches/sboyette/src/Makefile.am	2008-08-13 17:17:37 UTC (rev 1415)
@@ -17,7 +17,6 @@
 export OPENSRF	= opensrf
 export BINDIR	= @bindir@
 export LIBDIR	= @libdir@
-perldir	= $(LIBDIR)/perl5
 jsdir = $(LIBDIR)/javascript
 export OSRF_JAVA_DEPSDIR = @OSRF_JAVA_DEPSDIR@
 etcdir = $(ETCDIR)
@@ -47,7 +46,7 @@
 	mkdir -p $(LOG)
 	mkdir -p $(SOCK)
 	mkdir -p $(jsdir)
-	mkdir -p $(perldir)
+	make install-perl
 
 install-exec-hook:
 	sed -i 's|LOCALSTATEDIR|$(VAR)|g' '$(DESTDIR)@sysconfdir@/opensrf.xml.example'
@@ -60,12 +59,24 @@
 	sed -i 's|LIBDIR|$(LIBDIR)|g' '@abs_top_srcdir@/examples/multisession-test.pl'
 	sed -i 's|SYSCONFDIR|$(ETCDIR)|g' '@abs_top_srcdir@/doc/dokuwiki-doc-stubber.pl'
 	cp -r @srcdir@/javascript/* $(jsdir)/
-	sed -i 's|LOCALSTATEDIR|$(VAR)|g' '@srcdir@/perlmods/OpenSRF/Utils/Config.pm'
-	cp -r @srcdir@/perlmods/* $(perldir)/
 
 
+install-perl:
+	cd ./perl && perl Makefile.PL || make -s install-perl-fail
+	make -C perl
+	make -C perl test || make -s install-perl-fail
+	make -C perl install
+
+install-perl-fail:
+	echo
+	echo ">>> Installation of Perl modules has failed. The most likely"
+	echo ">>> possibility is that a dependency is not pre-installed"
+	echo ">>> or that a test has failed."
+	echo ">>> See the messages above this one for more information."
+	echo
+	exit 1
+
 uninstall-hook:
 	rm @includedir@/opensrf/apachetools.h
 	rm -R $(jsdir)
-	rm -R $(perldir)