From d5c9ce55b150a2ff0f035fa4e3c3a01fd26c6008 Mon Sep 17 00:00:00 2001
From: Oliver Bolte <obo@openoffice.org>
Date: Fri, 19 Nov 2004 08:21:42 +0000
Subject: INTEGRATION: CWS oooicons (1.2.10); FILE MERGED 2004/11/05 09:57:10
 cd 1.2.10.1: #i35193# Fixed standalone packimages problem

---
 automation/packimages/makefile.mk | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'automation/packimages')

diff --git a/automation/packimages/makefile.mk b/automation/packimages/makefile.mk
index 7444d33303ee..b81ff04fac1b 100644
--- a/automation/packimages/makefile.mk
+++ b/automation/packimages/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: rt $ $Date: 2004-09-20 12:24:09 $
+#   last change: $Author: obo $ $Date: 2004-11-19 09:21:42 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -82,6 +82,5 @@ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/images_tt.zip .PHONY:
     +$(COPY) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SOLARRESDIR))$/img$/svt*.ilst $(MISC) 
     +$(COPY) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SOLARRESDIR))$/img$/vcl*.ilst $(MISC) 
     +-$(MKDIR) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))
-    +-$(RM) $@ $@.$(INPATH)
-    +$(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SOLARSRC) -m $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SOLARRESDIR))$/img -c . -l $(MISC) -o $@.$(INPATH)
-    +$(RENAME) $@.$(INPATH) $@
+    +$(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SOLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(SOLARSRC)$/$(RSCCUSTOMIMG) -l $(MISC) -o $@
+
-- 
cgit v1.2.3