summaryrefslogtreecommitdiff
path: root/instsetoo_native
diff options
context:
space:
mode:
authorAndras Timar <atimar@suse.com>2011-09-27 21:33:07 +0200
committerAndras Timar <atimar@suse.com>2011-09-28 13:48:10 +0200
commit05293cb04c707b12047ce2378894cf6b7bb67bbc (patch)
tree546bad7e2bc6f23dc3ca6ed191395b7703ba04aa /instsetoo_native
parentd455410a3de86d2c772a96e50ff0d4c066c1605e (diff)
remove checks for unused BUILD_SPECIAL environment variable
Diffstat (limited to 'instsetoo_native')
-rw-r--r--instsetoo_native/util/makefile.mk9
1 files changed, 0 insertions, 9 deletions
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index d2878c39abca..b2cc69eb804d 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -183,13 +183,6 @@ MSIHELPPACKTEMPLATESOURCE=$(PRJ)$/inc_ooohelppack$/windows$/msi_templates
MSIURETEMPLATESOURCE=$(PRJ)$/inc_ure$/windows$/msi_templates
MSISDKOOTEMPLATESOURCE=$(PRJ)$/inc_sdkoo$/windows$/msi_templates
-.IF "$(BUILD_SPECIAL)"!=""
-MSIOFFICETEMPLATEDIR=$(MSIOFFICETEMPLATESOURCE)
-MSILANGPACKTEMPLATEDIR=$(MSILANGPACKTEMPLATESOURCE)
-MSIHELPPACKTEMPLATEDIR=$(MSIHELPPACKTEMPLATESOURCE)
-MSIURETEMPLATEDIR=$(MSIURETEMPLATESOURCE)
-MSISDKOOTEMPLATEDIR=$(MSISDKOOTEMPLATESOURCE)
-.ELSE # "$(BUILD_SPECIAL)"!=""
NOLOGOSPLASH:=$(BIN)$/intro.zip
DEVNOLOGOSPLASH:=$(BIN)$/dev$/intro.zip
MSIOFFICETEMPLATEDIR=$(MISC)$/openoffice$/msi_templates
@@ -236,8 +229,6 @@ $(foreach,i,$(allhelplangiso) oxygenofficehelppack_$i) : $(ADDDEPS)
$(MAKETARGETS) : $(ADDDEPS)
.ENDIF # "$(MAKETARGETS)"!=""
-.ENDIF # "$(BUILD_SPECIAL)"!=""
-
$(foreach,i,$(alllangiso) openoffice_$i) : $$@{$(PKGFORMAT:^".")}
.IF "$(MAKETARGETS)"!=""
.IF "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"