summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-03-11 11:38:23 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-03-11 11:38:23 +0000
commit6ee8e97acb02ccd9c2a1359f9146b4578dc81c2d (patch)
tree42233a322461c23f68fb94efa2f4b4c1ef15fb6c
parent6ca9b45d04ad44da1843475f7d1033a002accffc (diff)
downloaddrakx-backup-do-not-use-6ee8e97acb02ccd9c2a1359f9146b4578dc81c2d.tar
drakx-backup-do-not-use-6ee8e97acb02ccd9c2a1359f9146b4578dc81c2d.tar.gz
drakx-backup-do-not-use-6ee8e97acb02ccd9c2a1359f9146b4578dc81c2d.tar.bz2
drakx-backup-do-not-use-6ee8e97acb02ccd9c2a1359f9146b4578dc81c2d.tar.xz
drakx-backup-do-not-use-6ee8e97acb02ccd9c2a1359f9146b4578dc81c2d.zip
upload the various compssUsers* (esp. compssUsers.server)
-rw-r--r--Makefile2
-rw-r--r--perl-install/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index ea9b76d90..90cb7dfc9 100644
--- a/Makefile
+++ b/Makefile
@@ -122,7 +122,7 @@ upload:
upload_only:
function upload() { rsync -qSavz --verbose --exclude '*~' -e ssh --delete $(ROOTDEST)/$$1/$$2 mandrake@ken:/c/cooker/$$1; } ;\
upload Mandrake/mdkinst '' ;\
- upload Mandrake/base compssUsers ;\
+ upload Mandrake/base compssUsers* ;\
upload Mandrake/base rpmsrate ;\
upload Mandrake/base *_stage2.bz2 ;\
upload Mandrake/share/advertising '' ;\
diff --git a/perl-install/Makefile b/perl-install/Makefile
index 11c36df99..b49a911d5 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -154,7 +154,7 @@ endif
-cd share ; cp -f *.png *.xpm $(DEST)/usr/share
-cd pixmaps ; cp -f *.png *.xpm $(DEST)/usr/share ; rm -f $(DEST)/usr/share/wiz_*
cd share ; cp -a themes $(DEST)/usr/share/gtk
- cd share ; cp compssUsers compssUsers.desktop rpmsrate $(ROOTDEST)/Mandrake/base
+ cd share ; cp compssUsers compssUsers.* rpmsrate $(ROOTDEST)/Mandrake/base
clean-rpmsrate $(ROOTDEST)/Mandrake/base/rpmsrate $(ROOTDEST)/Mandrake/RPMS