diff options
author | Kurt Zenker <kz@openoffice.org> | 2006-11-08 10:56:03 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2006-11-08 10:56:03 +0000 |
commit | 786fb7a2174013bc88161be6b4a1296d4e9a82ed (patch) | |
tree | b9c062b3456a139391cdfcbe3b000698a267961b /sysui/desktop/suse | |
parent | a00c2403385f469ec94a8a1ef5af18e02c898a51 (diff) |
INTEGRATION: CWS ause070 (1.21.48); FILE MERGED
2006/10/18 15:15:35 hjs 1.21.48.2: #i70136# change check to work with configure default
2006/10/06 16:12:11 hjs 1.21.48.1: #i70136# local .ulf targets
Diffstat (limited to 'sysui/desktop/suse')
-rw-r--r-- | sysui/desktop/suse/makefile.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sysui/desktop/suse/makefile.mk b/sysui/desktop/suse/makefile.mk index 12233eb9dd..15f92ad61b 100644 --- a/sysui/desktop/suse/makefile.mk +++ b/sysui/desktop/suse/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.21 $ +# $Revision: 1.22 $ # -# last change: $Author: hr $ $Date: 2006-04-19 15:29:04 $ +# last change: $Author: kz $ $Date: 2006-11-08 11:56:03 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -139,7 +139,11 @@ RPMDEPN = \ $(MISC)/$(TARGET)/opt/gnome/share/icons/gnome/{$(GNOMEICONLIST)} \ $(MISC)/$(TARGET)/opt/kde3/share/icons/{$(KDEICONLIST)} +.IF "$(WITH_LANG)"!="" ULFDIR = $(COMMONMISC)$/desktopshare +.ELSE # "$(WITH_LANG)"!="" +ULFDIR:=..$/share +.ENDIF # "$(WITH_LANG)"!="" .ENDIF |