diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-04-19 14:28:03 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-04-19 14:28:03 +0000 |
| commit | d8d606e7014dc6a3d61e8d9211a366b08db3c911 (patch) | |
| tree | 523c4de16826bae729b146e6cca5cf71db65ab9b /sysui/desktop/mandriva | |
| parent | d555fd308153c852a1948ce93f9725223bdb1865 (diff) | |
INTEGRATION: CWS systemint01 (1.8.2); FILE MERGED
2006/03/21 09:20:40 rt 1.8.2.2: #i62340# Make checking for flagfile silent, only in case of failure cry 'ERROR'
2006/03/17 16:00:09 ihi 1.8.2.1: #i62340# creation of rpm more robust
Diffstat (limited to 'sysui/desktop/mandriva')
| -rw-r--r-- | sysui/desktop/mandriva/makefile.mk | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sysui/desktop/mandriva/makefile.mk b/sysui/desktop/mandriva/makefile.mk index ad6ca89be397..f06f8cdef8f2 100644 --- a/sysui/desktop/mandriva/makefile.mk +++ b/sysui/desktop/mandriva/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.9 $ # -# last change: $Author: kz $ $Date: 2006-01-31 18:19:45 $ +# last change: $Author: hr $ $Date: 2006-04-19 15:28:03 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -154,7 +154,8 @@ ALLTAR : $(RPMFILE) %.desktop : @$(MKDIRHIER) $(@:d) - @ln -sf $(subst,$(UNIXFILENAME)-, /etc/$(UNIXFILENAME)/share/xdg/$(@:f)) $@ + ln -svf $(subst,$(UNIXFILENAME)-, /etc/$(UNIXFILENAME)/share/xdg/$(@:f)) $@ +# @ln -sf $(subst,$(UNIXFILENAME)-, /etc/$(UNIXFILENAME)/share/xdg/$(@:f)) $@ # --- icons -------------------------------------------------------- @@ -212,7 +213,7 @@ $(MISC)/$(TARGET)/usr/bin/$(UNIXFILENAME)-printeradmin : ../share/printeradmin.s $(MISC)/$(TARGET)/usr/bin/soffice : @$(MKDIRHIER) $(@:d) - @ln -sf /etc/$(UNIXFILENAME)/program/soffice $@ + @ln -svf /etc/$(UNIXFILENAME)/program/soffice $@ $(MISC)/$(TARGET)/etc/$(UNIXFILENAME) : @$(MKDIRHIER) $(@:d) @@ -227,6 +228,7 @@ $(RPMFILE) : $(RPMDEPN) $(MISC)/$(TARGET)-menus.spec --buildroot $(LAUNCHERDIR) \ --define "unixfilename $(UNIXFILENAME)" \ --define "iconprefix $(ICONPREFIX)" \ - --define "version $(PKGVERSION)" --define "release $(PKGREV)" + --define "version $(PKGVERSION)" --define "release $(PKGREV)" && $(TOUCH) $(MISC)$/$(TARGET).rpmflag + @+$(TYPE) $(MISC)$/$(TARGET).rpmflag || echo "ERROR: packing $(TARGET) failed! " .ENDIF |