Changeset 10c32c9 for perl/modules/Makefile.am

Timestamp:

Jun 20, 2013, 9:52:06 AM (11 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Parents:

80d7b44 (diff), e4b8f93 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge e4b8f937e213d2addfd212ab06571d541b2b532e into 80d7b445c48a5c63361e0ae972d0b0264d54ed65

File:

• perl/modules/Makefile.am (modified) (2 diffs)

perl/modules/Makefile.am

@@ -1 +1 @@
 MODULES = Jabber IRC WordWrap Twitter Facebook
 
-EXTRA_DIST = $(MODULES:=/Makefile.PL) $(MODULES:=/inc) $(MODULES:=/lib)
+EXTRA_DIST = $(MODULES:=/Makefile.PL) $(MODULES:=/lib)
 EXTRA_DIST += \
     Facebook/README \
@@ -11 +11 @@
         (cd $* && $(MAKE) $*.par)
 
+BARNOWL_PERL := $(shell which perl) -I$(abs_srcdir)/../lib
+
 MODULES_MAKEFILE = $(MODULES:=/Makefile)
-$(MODULES_MAKEFILE): %/Makefile: %/Makefile.PL
-        [ $(srcdir) = . ] || cp -srf --no-preserve=mode -- $(abs_srcdir)/$*/. $*
-        $(AM_V_GEN)(cd $* && perl -I../../lib Makefile.PL)
+$(MODULES_MAKEFILE): %/Makefile: %/Makefile.PL ../lib/Module/Install/BarnOwl.pm
+        $(AM_V_GEN)test -d $* || mkdir $*
+        $(AM_V_at)test $(srcdir) = . || $(LN_S) $(abs_srcdir)/$*/Makefile.PL $*/Makefile.PL
+        $(AM_V_at)(cd $* && BARNOWL_SRCDIR='$(abs_srcdir)/$*' && export BARNOWL_SRCDIR && $(BARNOWL_PERL) Makefile.PL 'PERL=$(BARNOWL_PERL)')
 
 MODULES_CLEAN = $(MODULES:%=clean_%)
 clean-local: $(MODULES_CLEAN)
 $(MODULES_CLEAN): clean_%:
-        if [ $(srcdir) = . ]; then \
-            (cd $* && { test ! -f Makefile || $(MAKE) realclean; }) && \
-            rm -f $*/$*.par; \
-        else \
-            rm -rf $*; \
-        fi
+        (cd $* && { test ! -f Makefile || $(MAKE) realclean; })
+        rm -f $*/$*.par
+        rm -rf $*/inc
+        test $(srcdir) = . || rm -f $*/Makefile.PL
 
 MODULES_INSTALL = $(MODULES:%=module_install_%)