projects
/
id3fs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
34ddc60
)
fix sbin support
author
Ian Beckwith
<ianb@erislabs.net>
Sat, 16 Oct 2010 11:38:32 +0000
(12:38 +0100)
committer
Ian Beckwith
<ianb@erislabs.net>
Sat, 16 Oct 2010 11:38:32 +0000
(12:38 +0100)
Makefile.PL
patch
|
blob
|
history
diff --git
a/Makefile.PL
b/Makefile.PL
index
188e130
..
0724cd7
100644
(file)
--- a/
Makefile.PL
+++ b/
Makefile.PL
@@
-7,12
+7,11
@@
my @sbinscripts=qw(id3fsd);
WriteMakefile(NAME=>"id3fs",
VERSION=>"1.0",
WriteMakefile(NAME=>"id3fs",
VERSION=>"1.0",
- EXE_FILES=>[ map( "bin/$_", @binscripts)
, map( "sbin/$_", @sbinscripts)
],
+ EXE_FILES=>[ map( "bin/$_", @binscripts) ],
MAN1PODS=>{ map({ +"bin/$_" => "\${INST_MAN1DIR}/$_.1" } @binscripts) },
MAN1PODS=>{ map({ +"bin/$_" => "\${INST_MAN1DIR}/$_.1" } @binscripts) },
- MAN8PODS=>{ map({ +"sbin/$_" => "\${INST_MAN8DIR}/$_.8" } @sbinscripts) },
PREREQ_PM=>{ 'Fuse' => 0,
'DBI' => 0,
PREREQ_PM=>{ 'Fuse' => 0,
'DBI' => 0,
- 'DBD::S
ql
ite' => 0} ,
+ 'DBD::S
QL
ite' => 0} ,
# dist=>{ COMPRESS=>"gzip -9f", SUFFIX=>"gz", },
($] >= 5.005
? (ABSTRACT => 'FUSE-based filesystem for browsing music metadata',
# dist=>{ COMPRESS=>"gzip -9f", SUFFIX=>"gz", },
($] >= 5.005
? (ABSTRACT => 'FUSE-based filesystem for browsing music metadata',
@@
-33,7
+32,7
@@
sub constants {
my $add = q{
# begin id3fs
my $add = q{
# begin id3fs
-
#MAN5PODS = docs/mp3lintrc.po
d
+
MAN8PODS = sbin/id3fs
d
INST_MAN8DIR = blib/man8
INSTALLMAN8DIR = $(PREFIX)/man/man8
DESTINSTALLMAN8DIR = $(DESTDIR)$(INSTALLMAN8DIR)
INST_MAN8DIR = blib/man8
INSTALLMAN8DIR = $(PREFIX)/man/man8
DESTINSTALLMAN8DIR = $(DESTDIR)$(INSTALLMAN8DIR)
@@
-42,9
+41,10
@@
DESTINSTALLSITEMAN8DIR = $(DESTDIR)$(INSTALLSITEMAN8DIR)
INSTALLVENDORMAN8DIR = $(VENDORPREFIX)/man/man8
DESTINSTALLVENDORMAN8DIR = $(DESTDIR)$(INSTALLVENDORMAN8DIR)
MAN8EXT = 8
INSTALLVENDORMAN8DIR = $(VENDORPREFIX)/man/man8
DESTINSTALLVENDORMAN8DIR = $(DESTDIR)$(INSTALLVENDORMAN8DIR)
MAN8EXT = 8
-INST_SYSCONFDIR = blib/etc
-INSTALLSYSCONFDIR = /etc
-DESTINSTALLSYSCONFDIR = $(DESTDIR)$(INSTALLSYSCONFDIR)
+SBIN_FILES = sbin/id3fsd
+INST_SBINDIR = blib/sbin
+INSTALLSBINDIR = $(SITEPREFIX)/sbin
+DESTINSTALLSBINDIR = $(DESTDIR)$(INSTALLSBINDIR)
# end id3fs
};
# end id3fs
};
@@
-68,7
+68,7
@@
sub MY::top_targets {
my $add = sprintf <<'MAKE_FRAG', $perlh, $perlh, $perlh, $perlh;
# begin id3fs
my $add = sprintf <<'MAKE_FRAG', $perlh, $perlh, $perlh, $perlh;
# begin id3fs
-config :: $(INST_MAN8DIR)/.exists $(INST_S
YSCONF
DIR)/.exists
+config :: $(INST_MAN8DIR)/.exists $(INST_S
BIN
DIR)/.exists
@$(NOOP)
$(INST_MAN8DIR)/.exists :: %s
@$(NOOP)
$(INST_MAN8DIR)/.exists :: %s
@@
-76,11
+76,11
@@
$(INST_MAN8DIR)/.exists :: %s
@$(EQUALIZE_TIMESTAMP) %s $(INST_MAN8DIR)/.exists
-@$(CHMOD) $(PERM_RWX) $(INST_MAN8DIR)
@$(EQUALIZE_TIMESTAMP) %s $(INST_MAN8DIR)/.exists
-@$(CHMOD) $(PERM_RWX) $(INST_MAN8DIR)
-
#$(INST_SYSCONF
DIR)/.exists :: %s
-
# @$(MKPATH) $(INST_SYSCONF
DIR)
-
# @$(EQUALIZE_TIMESTAMP) %s $(INST_SYSCONF
DIR)/.exists
-
# -@$(CHMOD) $(PERM_RWX) $(INST_SYSCONF
DIR)
-
# @$(CP) etc/matrc $(INST_SYSCONF
DIR)
+
$(INST_SBIN
DIR)/.exists :: %s
+
@$(MKPATH) $(INST_SBIN
DIR)
+
@$(EQUALIZE_TIMESTAMP) %s $(INST_SBIN
DIR)/.exists
+
-@$(CHMOD) $(PERM_RWX) $(INST_SBIN
DIR)
+
@$(CP) $(SBIN_FILES) $(INST_SBIN
DIR)
# end id3fs
MAKE_FRAG
# end id3fs
MAKE_FRAG
@@
-101,16
+101,16
@@
sub MY::manifypods {
{
$pod2man=q{POD2MAN = $(POD2MAN_EXE)};
}
{
$pod2man=q{POD2MAN = $(POD2MAN_EXE)};
}
-
#
my $manifypods_local = sprintf <<'MAKE_FRAG', $pod2man;
-#
-#
#
begin id3fs
-
#
%s
-#
-
#manifypods-local : docs/mp3lintrc.po
d
-# $(POD2MAN) -s $(MAN8EXT) docs/mp3lintrc.pod $(INST_MAN8DIR)/mp3lintrc.$(MAN8EXT)
-#
-#
#
end id3fs
-
#
MAKE_FRAG
+ my $manifypods_local = sprintf <<'MAKE_FRAG', $pod2man;
+
+# begin id3fs
+%s
+
+
manifypods-local : sbin/id3fs
d
+ $(POD2MAN) -s $(MAN8EXT) sbin/id3fsd $(INST_MAN8DIR)/id3fsd.$(MAN8EXT)
+
+#end id3fs
+MAKE_FRAG
return $inherited . "\n" . $manifypods_local;
return $inherited . "\n" . $manifypods_local;
@@
-121,9
+121,9
@@
sub MY::install {
my $self = shift;
my $inherited = $self->SUPER::install(@_);
my $self = shift;
my $inherited = $self->SUPER::install(@_);
- my $conf="\t\t\$(INST_S
YSCONFDIR) \$(DESTINSTALLSYSCONF
DIR)";
+ my $conf="\t\t\$(INST_S
BINDIR) \$(DESTINSTALLSBIN
DIR)";
$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_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_MAN3DIR\s*.*MAN3DIR\))/$1 \\\n$conf/gm;
return $inherited;
}
return $inherited;
}