diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-06-02 14:00:18 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-06-02 14:00:18 +0000 |
| commit | bb0ce5be6c6c11a8954e1d2f7c52d211c72181bc (patch) | |
| tree | 91839efefe28db90021230b700346ed41283f343 | |
| parent | be72c5e94a95834dbceda0a8835b49ad0af6449b (diff) | |
| download | drakx-bb0ce5be6c6c11a8954e1d2f7c52d211c72181bc.tar drakx-bb0ce5be6c6c11a8954e1d2f7c52d211c72181bc.tar.gz drakx-bb0ce5be6c6c11a8954e1d2f7c52d211c72181bc.tar.bz2 drakx-bb0ce5be6c6c11a8954e1d2f7c52d211c72181bc.tar.xz drakx-bb0ce5be6c6c11a8954e1d2f7c52d211c72181bc.zip | |
- build data/i18n_*.list if missing
- don't copy MDK::Common files (we use the 10.0 package verbatim)
- don't put mdk_totem in /etc/skel/Desktop, otherwise the desktop is not created correctly
| -rw-r--r-- | move/Makefile | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/move/Makefile b/move/Makefile index 58c2e58c7..80729477e 100644 --- a/move/Makefile +++ b/move/Makefile @@ -1,4 +1,4 @@ -DEST = /BIG/move +DEST = /tmp DEST_LIVETREE = $(DEST)/live_tree DEST_STAGE2 = $(DEST_LIVETREE)/usr/lib/stage2 @@ -35,7 +35,10 @@ iso: build install live_tree_boot clps only_iso build: stage1 xwait runlevel_set $(MAKE) -C ../perl-install mo_files -install: un_live_tree_boot +data/i18n_en.list: + cd data ; ./make_i18n_list $(DEST_LIVETREE) + +install: un_live_tree_boot data/i18n_en.list sudo ./collect-directories-to-create.pl $(DEST_LIVETREE) > data/directories-to-create sudo find $(DEST_LIVETREE)/etc -type f | perl -pe 's|$(DEST_LIVETREE)||' > data/all-etcfiles @@ -68,7 +71,7 @@ install: un_live_tree_boot sudo cp -f ../perl-install/c/blib/arch/auto/stuff/stuff.so $(DEST_LIVETREE)/usr/lib/libDrakX/auto/c/stuff #- overwrite MDK-Common - sudo cp -f ../../soft/perl-MDK-Common/MDK/Common/*.pm $(DEST_LIVETREE)/usr/$(LIB_NAME)/perl5/vendor_perl/*/MDK/Common +# sudo cp -f ../../soft/perl-MDK-Common/MDK/Common/*.pm $(DEST_LIVETREE)/usr/$(LIB_NAME)/perl5/vendor_perl/*/MDK/Common #- duplicated :( sudo perl -pi -e 's/#[-+].*//; $$_ = "\n" if (/^=(head|begin)/ .. /^=cut/) || /use (diagnostics|vars|strict)/' $(DEST_STAGE2)/*.pm `find $(DEST_LIVETREE)/usr/lib/libDrakX -name "*.pm"` @@ -79,7 +82,7 @@ install: un_live_tree_boot sudo install -m 440 tree/sudoers $(DEST_LIVETREE)/etc sudo install -m 644 tree/mdk_move_boot_loop.desktop $(DEST_LIVETREE)/usr/share/autostart sudo install tree/{mdk_move_loop,mdk_totem,mdk_behind_totem} $(DEST_LIVETREE)/usr/bin - sudo install -m 644 -D tree/mdk_totem.desktop $(DEST_LIVETREE)/etc/skel/Desktop/mdk_totem.desktop + sudo install -m 644 -D tree/mdk_totem.desktop $(DEST_LIVETREE)/usr/share/apps/kdesktop/DesktopLinks/mdk_totem.desktop sudo install -m 644 tree/{kdedrc,konsolerc} $(DEST_LIVETREE)/usr/share/config sudo install -m 644 img/Mandrake.png $(DEST_LIVETREE)/usr/share/mdk/backgrounds sudo install -m 644 img/FE* $(DEST_LIVETREE)/usr/share/wallpapers |