svn commit: r154088 - spamassassin/trunk/Makefile.PL

[ms...@apache.org]

Author: mss
Date: Wed Feb 16 14:04:06 2005
New Revision: 154088

URL: http://svn.apache.org/viewcvs?view=rev&rev=154088
Log:
Fixing up the symlink stuff in the Makefile:
 * Don't use the unportable enhanced Makefile syntax, do everything in Perl
   where its possible.
 * The check wether symlink() is available is now done already in the
   Makefile.PM, setting a macro SYMLINK.
 * Added an I_SCRIPTDIR as a reference to the macro which points to where the
   scripts are installed.  INSTALLSCRIPT is a weird one as its the same for
   all repositories (see the EU::MM manpage for a list of the vars for each
   repo).
 * We need to remove any possibly existing symlink or old script file with
   $(RM_R) first because symlink() does not override.  Also made the perl
   call die() if symlink() fails for some other reason (like Permission
   Denied).
 * Added some comments to older code.

To test it, try
  PERL_MM_USE_DEFAULT=1 make bin__install INSTALLSCRIPT=/tmp
Try it also with a INSTALLSCRIPT in which you may not write.
Make the check in Makefile.PL line 870 fail to test the $(CP) alternative.

Modified:
    spamassassin/trunk/Makefile.PL

Modified: spamassassin/trunk/Makefile.PL
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/Makefile.PL?view=diff&r1=154087&r2=154088
==============================================================================
--- spamassassin/trunk/Makefile.PL (original)
+++ spamassassin/trunk/Makefile.PL Wed Feb 16 14:04:06 2005
@@ -857,6 +857,27 @@
   set_macro('CONFIGURE', join(' ', macro_ref('PERL_BIN'), qq{spamc/configure.pl}));
 }
 
+# This routine sets the value for the SYMLINK command.
+#
+# There are no parameters.
+#
+# $(SYMLINK) calls Perl's symlink() function if available, else falls back 
+# to $(CP).
+sub _set_macro_SYMLINK {
+
+  return if get_macro('SYMLINK');
+  
+  if (eval { symlink("", "") or 1 }) {
+    my $code = q{symlink((splitpath($ARGV[0]))[2], $ARGV[1]) || die qq{$!\n}};
+    $code =~ s/(\$)/$1$1/g;
+    $code = qq{'$code'};
+    set_macro('SYMLINK', join(' ', macro_ref('PERL_BIN'), q{-MFile::Spec::Functions=splitpath}, q{-e}, $code));
+  }
+  else {
+    set_macro('SYMLINK', macro_ref('CP'));
+  }
+}
+
 
 # Override the libscan routine so it skips SVN/CVS stuff and some common
 # patch/backup extensions.
@@ -1010,22 +1031,31 @@
   {
     _set_macro_PREPROCESS;
     _set_macro_CONFIGURE;
+    _set_macro_SYMLINK;
 
     # Add it to the Makefile.
     push(@code, qq{});
     push(@code, macro_def('PREPROCESS'));
     push(@code, macro_def('CONFIGURE'));
+    push(@code, macro_def('SYMLINK'));
   }
 
-  # Set some additional helper/shortcut macros.
+  # Set some additional helper/shortcut macros; the B_FOO are the ones which
+  # can be temporary locations if DESTDIR is used, I_FOO are the final 
+  # destinations.
   {
     my($repository);
     $repository = uc($SELF->{INSTALLDIRS}) || 'SITE';
 
+    # For these the install paths are needed only.
     foreach my $macro (qw(PREFIX SYSCONFDIR)) {
       push(@code, macro_def('I_' . $macro,
                     macro_ref($repository . $macro)));
     }
+    # The SCRIPTDIR is the same for each repository.  Luckily do we need only
+    # the I_-variant.
+    push(@code, macro_def('I_SCRIPTDIR', macro_ref('INSTALLSCRIPT')));
+    # For the following we need bot the B_- and the I_-variants.
     foreach my $macro (qw(DATA CONF LIB)) {
       push(@code, macro_def('I_' . $macro . 'DIR',
                     macro_ref('INSTALL' . repository($repository) . $macro)));
@@ -1148,15 +1178,10 @@
 	$(MAKE_SPAMC_OLD)
 	$(CHMOD) $(PERM_RWX) $@
 
-# try to figure out where sa-filter is going to be installed
-ifeq "$(INSTALLDIRS)" "site"
-INSTALLSCRIPTREALLY = $(INSTALLSITEBIN)
-else
-INSTALLSCRIPTREALLY = $(INSTALLSCRIPT)
-endif
 
-bin__install:
-	$(PERL) -MFile::Copy -e 'chdir q{$(INSTALLSCRIPTREALLY)}; $$symlink_exists = eval { symlink("",""); 1 }; if ($$symlink_exists) { symlink(q{sa-filter}, q{spamassassin}); } else { copy(q{sa-filter}, q{spamassassin}); }'
+bin__install: $(INST_SCRIPT)/sa-filter
+	$(RM_F) $(I_SCRIPTDIR)/spamassassin
+	$(SYMLINK) $(INST_SCRIPT)/sa-filter $(I_SCRIPTDIR)/spamassassin
 
 conf__install:
 	-$(MKPATH) $(B_CONFDIR)