fix man8 and sbin install target destinations for vendor/site/etc
authorIan Beckwith <ianb@erislabs.net>
Sat, 16 Oct 2010 12:43:09 +0000 (13:43 +0100)
committerIan Beckwith <ianb@erislabs.net>
Sat, 16 Oct 2010 12:43:09 +0000 (13:43 +0100)
Makefile.PL

index 0724cd7..57ebb03 100644 (file)
@@ -34,17 +34,21 @@ sub constants {
 # begin id3fs
 MAN8PODS = sbin/id3fsd
 INST_MAN8DIR = blib/man8
-INSTALLMAN8DIR = $(PREFIX)/man/man8
+INSTALLMAN8DIR = $(PERLPREFIX)/share/man/man8
 DESTINSTALLMAN8DIR = $(DESTDIR)$(INSTALLMAN8DIR)
 INSTALLSITEMAN8DIR = $(SITEPREFIX)/man/man8
 DESTINSTALLSITEMAN8DIR = $(DESTDIR)$(INSTALLSITEMAN8DIR)
-INSTALLVENDORMAN8DIR = $(VENDORPREFIX)/man/man8
+INSTALLVENDORMAN8DIR = $(VENDORPREFIX)/share/man/man8
 DESTINSTALLVENDORMAN8DIR = $(DESTDIR)$(INSTALLVENDORMAN8DIR)
 MAN8EXT = 8
 SBIN_FILES = sbin/id3fsd
 INST_SBINDIR = blib/sbin
-INSTALLSBINDIR = $(SITEPREFIX)/sbin
+INSTALLSBINDIR = $(PERLPREFIX)/sbin
 DESTINSTALLSBINDIR = $(DESTDIR)$(INSTALLSBINDIR)
+INSTALLSITESBINDIR = $(SITEPREFIX)/sbin
+DESTINSTALLSITESBINDIR = $(DESTDIR)$(INSTALLSITESBINDIR)
+INSTALLVENDORSBINDIR = $(VENDORPREFIX)/sbin
+DESTINSTALLVENDORSBINDIR = $(DESTDIR)$(INSTALLVENDORSBINDIR)
 # end id3fs
 
 };
@@ -121,9 +125,8 @@ sub MY::install {
 
   my $self = shift;
   my $inherited = $self->SUPER::install(@_);
-  my $conf="\t\t\$(INST_SBINDIR) \$(DESTINSTALLSBINDIR)";
-  $inherited =~ s/(^\s*\$\(INST_MAN)3(DIR\s*.*MAN)3(DIR\))/${1}3${2}3$3 \\\n${1}8${2}8$3 \\\n$conf/gm;
-  $inherited =~ s/(^\s*\$\(INST_MAN3DIR\s*.*MAN3DIR\))/$1 \\\n$conf/gm;
+  $inherited =~ s/(^\s*\$\(INST_)MAN3(DIR\s*.*)MAN3(DIR\))/${1}MAN3${2}MAN3${3} \\\n${1}SBIN${2}SBIN${3}/gm;
+  $inherited =~ s/(^\s*\$\(INST_MAN)3(DIR\s*.*MAN)3(DIR\))/${1}3${2}3$3 \\\n${1}8${2}8$3/gm;
 
   return $inherited;
 }