summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-07-24 10:34:13 +0000
committerThierry Vignaud <tv@mageia.org>2012-07-24 10:34:13 +0000
commit5068178a5f3f249c902e0d1d2119cec30019787b (patch)
tree357ea18dd9e72872063d7a39844434bec8fd0bcd
parentfcee364e1fc11134ea266b27de50d7c508c25ea9 (diff)
downloaddrakx-5068178a5f3f249c902e0d1d2119cec30019787b.tar
drakx-5068178a5f3f249c902e0d1d2119cec30019787b.tar.gz
drakx-5068178a5f3f249c902e0d1d2119cec30019787b.tar.bz2
drakx-5068178a5f3f249c902e0d1d2119cec30019787b.tar.xz
drakx-5068178a5f3f249c902e0d1d2119cec30019787b.zip
minimal adapt to /usr move
-rw-r--r--perl-install/install/Makefile3
-rw-r--r--perl-install/install/NEWS1
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/install/Makefile b/perl-install/install/Makefile
index 79662f95a..62a17b6c1 100644
--- a/perl-install/install/Makefile
+++ b/perl-install/install/Makefile
@@ -105,9 +105,10 @@ compress:
stage2:
rm -rf $(DEST)
- mkdir -p $(DEST)
+ mkdir -p $(DEST)/usr
$(MAKE) get_needed_files
$(MAKE) install_pms
+ for i in bin ; do mv $(DEST)/$$i/* $(DEST)/usr/$$i; rmdir $(DEST)/$$i; ln -s /usr/$$i $(DEST); done
dont_run_directly_stage2:
[ -d $(DEST) ] || ../../tools/mdkinst_stage2_tool --uncompress $(STAGE2_DEST)
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index a9c121fc4..a2c4867c1 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,6 @@
- adapt to latest GDB
- adapt to latest systemd/udevd
+- adapt to /usr move
- nfs install: install nfs-utils instead of nfs-utils-clients
(#6570, merged back in nfs-utils)