summaryrefslogtreecommitdiff
path: root/sysui/desktop/suse
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2004-07-13 08:02:02 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2004-07-13 08:02:02 +0000
commita56e2fbe7b76c778e95c005a480fbec526a2aa79 (patch)
treeffca7df6c5e18206358da48ebe857f6b9d313155 /sysui/desktop/suse
parent7a570f6136b397f3f735b639312ad517b6df032b (diff)
INTEGRATION: CWS instfixer (1.2.14); FILE MERGED
2004/07/08 12:01:42 obr 1.2.14.1: #i10000# fixed rpm[build] missmatch
Diffstat (limited to 'sysui/desktop/suse')
-rw-r--r--sysui/desktop/suse/makefile.mk20
1 files changed, 7 insertions, 13 deletions
diff --git a/sysui/desktop/suse/makefile.mk b/sysui/desktop/suse/makefile.mk
index 3120820333cc..316619da94c5 100644
--- a/sysui/desktop/suse/makefile.mk
+++ b/sysui/desktop/suse/makefile.mk
@@ -61,11 +61,10 @@ PRJ=..$/..
PRJNAME=sysui
TARGET=suse
-RPM = rpm`test -x /usr/bin/rpmbuild && echo "build"`
-
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
+.INCLUDE : packtools.mk
# --- Product Version Information ----------------------------------
@@ -109,7 +108,7 @@ KDEICONLIST = \
locolor/{16x16 22x22 32x32}/apps/$(UNIXFILENAME)-{$(LAUNCHERLIST)}.png \
locolor/{16x16 22x22 32x32}/mimetypes/$(UNIXFILENAME)-{$(MIMELIST)}.png
-.IF "$(OS)"=="LINUX"
+.IF "$(RPM)"!=""
RPMFLAGFILE = $(MISC)$/$(TARGET).flag
RPMDEPN = \
@@ -130,7 +129,7 @@ RPMDIR = $(shell cd $(BIN); pwd)
.INCLUDE : target.mk
-.IF "$(OS)"=="LINUX"
+.IF "$(RPM)"!=""
ALLTAR : $(RPMFLAGFILE)
@@ -194,17 +193,12 @@ $(MISC)/$(TARGET)/opt/gnome/share/application-registry/$(UNIXFILENAME).applicati
@echo ---------------------------------
@cat $< | tr -d "\015" | sed -e "s/openoffice/$(UNIXFILENAME)/" -e "s/%PRODUCTNAME/$(LONGPRODUCTNAME)/" > $@
-# --- spec file ---------------------------------------------------
-
-# Copy the spec file to $(MISC)
-$(MISC)/$(TARGET)-menus.spec : $$(@:f)
- @cat $(@:f) | tr -d "\015" | sed "s/%PREFIX/$(UNIXFILENAME)/" > $@
- @echo "%define _rpmdir $(RPMDIR)" >> $@
-
# --- packaging ---------------------------------------------------
-$(RPMFLAGFILE) : $$(@:db)-menus.spec $(RPMDEPN)
+$(RPMFLAGFILE) : $(RPMDEPN)
+ @cat $(@:b)-menus.spec | tr -d "\015" | sed "s/%PREFIX/$(UNIXFILENAME)/" > $(@:db)-menus.spec
+ @echo "%define _rpmdir $(RPMDIR)" >> $(@:db)-menus.spec
@$(RPM) -bb $(@:db)-menus.spec --buildroot $(LAUNCHERDIR) --target noarch
@touch $@
-
+
.ENDIF