From 93f261246dfd59eafbf72f1f574f7f6e7b10e05f Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien
Date: Wed, 19 Apr 2006 14:28:39 +0000
Subject: INTEGRATION: CWS systemint01 (1.19.2); FILE MERGED 2006/03/21
09:20:41 rt 1.19.2.2: #i62340# Make checking for flagfile silent, only in
case of failure cry 'ERROR' 2006/03/17 16:00:10 ihi 1.19.2.1: #i62340#
creation of rpm more robust
---
sysui/desktop/redhat/makefile.mk | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
(limited to 'sysui')
diff --git a/sysui/desktop/redhat/makefile.mk b/sysui/desktop/redhat/makefile.mk
index 8da4bb0c3cc8..799a9454125d 100644
--- a/sysui/desktop/redhat/makefile.mk
+++ b/sysui/desktop/redhat/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.19 $
+# $Revision: 1.20 $
#
-# last change: $Author: kz $ $Date: 2006-01-31 18:19:57 $
+# last change: $Author: hr $ $Date: 2006-04-19 15:28:39 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -233,7 +233,6 @@ $(RPMFILE) : $(RPMDEPN) $(MISC)/$(TARGET)-menus.spec
--buildroot $(LAUNCHERDIR) \
--define "_builddir $(shell cd ../share; pwd)" \
--define "unixfilename $(UNIXFILENAME)" \
- --define "version $(PKGVERSION)" --define "release $(PKGREV)"
- @touch $(MISC)$/$(TARGET).rpmflag
-
+ --define "version $(PKGVERSION)" --define "release $(PKGREV)" && $(TOUCH) $(MISC)$/$(TARGET).rpmflag
+ @+$(TYPE) $(MISC)$/$(TARGET).rpmflag || echo "ERROR: packing $(TARGET) failed! "
.ENDIF
--
cgit