summaryrefslogtreecommitdiffstats
path: root/perl-install/Makefile.drakxtools
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2002-07-09 13:23:49 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2002-07-09 13:23:49 +0000
commit15052c100e148a94553ee155d7384b67e6537675 (patch)
tree118d6e5702d061645cd0c25c9bedca6740e3a551 /perl-install/Makefile.drakxtools
parenta6a904a31e39b74144c53f0cc4086d496b70c09a (diff)
downloaddrakx-backup-do-not-use-15052c100e148a94553ee155d7384b67e6537675.tar
drakx-backup-do-not-use-15052c100e148a94553ee155d7384b67e6537675.tar.gz
drakx-backup-do-not-use-15052c100e148a94553ee155d7384b67e6537675.tar.bz2
drakx-backup-do-not-use-15052c100e148a94553ee155d7384b67e6537675.tar.xz
drakx-backup-do-not-use-15052c100e148a94553ee155d7384b67e6537675.zip
fix boot freeze on hw change: initscript was running us with stdout
redirected to /dev/null; just use a small sh wrapper to fix it
Diffstat (limited to 'perl-install/Makefile.drakxtools')
-rw-r--r--perl-install/Makefile.drakxtools7
1 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/Makefile.drakxtools b/perl-install/Makefile.drakxtools
index e5e7f4ae8..bae306025 100644
--- a/perl-install/Makefile.drakxtools
+++ b/perl-install/Makefile.drakxtools
@@ -26,7 +26,7 @@ $(DIRS):
[ ! -e $@/Makefile ] || $(MAKE) -C $@
install:
- mkdir -p $(BINDEST) $(ETCDEST) $(SBINDEST) $(DATADIR)/pixmaps $(LIBDEST)/{network,security,harddrake} $(BINX11DEST) $(LIBX11DEST) $(PIXDIR) $(INITDIR)
+ mkdir -p $(BINDEST) $(ETCDEST) $(SBINDEST) $(DATADIR)/{harddrake,pixmaps} $(LIBDEST)/{network,security,harddrake} $(BINX11DEST) $(LIBX11DEST) $(PIXDIR) $(INITDIR)
install -d $(INLIBDEST_DIRS:%=$(LIBDEST)/%)
install $(STANDALONEPMS) $(SBINDEST)
install -s rpcinfo-flushed ddcprobe/ddcxinfos serial_probe/serial_probe $(SBINDEST)
@@ -50,7 +50,7 @@ install:
install -d $(LIBDEST)/diskdrake
install -m 644 diskdrake/*.pm $(LIBDEST)/diskdrake
- find $(LIBDEST) -name "*.pm" | xargs perl -pi -e '$$_ = "\n" if /\s*use\s+(diagnostics|vars|strict)/'
+ find $(LIBDEST) -name "*.pm" | xargs perl -pi -e 's/\s*use\s+(diagnostics|vars|strict)//g'
for i in $(HAVEINST_DIRS); do \
$(MAKE) -C $$i install PREFIX=$(PREFIX) DATADIR=$(DATADIR) NAME=$(NAME) ; \
@@ -59,4 +59,5 @@ install:
find auto -follow -name .exists -o -name "*.bs" | xargs rm -f
cp -rfL auto standalone/icons $(LIBDEST)
mv $(LIBDEST)/icons/harddrake2/ $(DATADIR)/pixmaps/
- mv $(SBINDEST)/service_harddrake $(INITDIR)/harddrake
+ mv $(SBINDEST)/service_harddrake.sh $(INITDIR)/harddrake
+ mv $(SBINDEST)/service_harddrake $(DATADIR)/harddrake/