[Ultrapossum-cvs 843] ultrapossum 1.26,1.27,Makefile.am

Back to archive index

Masato Taruishi taru****@users*****
2004年 10月 13日 (水) 16:59:30 JST


===================================================================
RCS file: ultrapossum/Makefile.am,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ultrapossum/Makefile.am	2004/10/13 03:20:28	1.26
+++ ultrapossum/Makefile.am	2004/10/13 07:59:30	1.27
@@ -47,10 +47,15 @@
 
 CONFIGS = ultrapossum.cf default.cf config.cf
 
-perl/blib/man3/UltraPossum.3pm:
-	cd perl && perl Makefile.PL INSTALLDIRS=vendor && $(MAKE)
+perl/Makefile:
+	cd perl && perl Makefile.PL
+#	cd perl && perl Makefile.PL INSTALLDIRS=vendor
 
-ABS_DESTDIR = `if test -n "$(DESTDIR)"; then cd $(DESTDIR) > /dev/null; pwd; fi`
+perl/blib/man3/UltraPossum.3pm: perl/Makefile
+	$(MAKE) && $(MAKE) test
+
+# support perl 5.8.0 limitation
+ABS_DESTDIR = `if test -n "$(DESTDIR)"; then cd $(DESTDIR) > /dev/null; echo PREFIX=$(pwd)/@prefix@; fi`
 
 install-data-local: perl/blib/man3/UltraPossum.3pm
 
@@ -58,8 +63,9 @@
 	$(mkinstalldirs) $(DESTDIR)/$(sysconfdir)/$(PACKAGE)/projects/
 	$(mkinstalldirs) $(DESTDIR)/$(sysconfdir)/$(PACKAGE)/apps/
 
-	$(MAKE) -C perl DESTDIR=$(ABS_DESTDIR) install
-	
+#	$(MAKE) -C perl DESTDIR=$(ABS_DESTDIR) install
+	-$(MAKE) -C perl $(ABS_DESTDIR) install
+
 	for f in $(CONFIGS); do \
 	  if test -f $(DESTDIR)/$(sysconfdir)/$(PACKAGE)/$$f; then \
 	    if ! diff $(DESTDIR)/$(sysconfdir)/$(PACKAGE)/$$f $(srcdir)/$$f > /dev/null ; then \



Ultrapossum-cvs メーリングリストの案内
Back to archive index