diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-04-13 13:27:41 +0200 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-04-13 13:27:41 +0200 |
| commit | af1645d6a2c02dadfe212e030ad1ddcad9f17cae (patch) | |
| tree | 6dcd4e9586c9ed31f9d17ce187c1e4925e14228f /setup_native/scripts | |
| parent | f00da4be08aea13e49f95b516b86eeb1ba48c720 (diff) | |
| parent | f573d06ba62efe9143efb73f10e74aa05185bb0e (diff) | |
CWS-TOOLING: integrate CWS ause117
Diffstat (limited to 'setup_native/scripts')
| -rw-r--r-- | setup_native/scripts/makefile.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/setup_native/scripts/makefile.mk b/setup_native/scripts/makefile.mk index b8fc6649eddf..de91bd011efe 100644 --- a/setup_native/scripts/makefile.mk +++ b/setup_native/scripts/makefile.mk @@ -50,7 +50,8 @@ UNIXTEXT= \ UNIXTEXT+= $(BIN)$/stclient_wrapper.sh .ENDIF -FAKEDB=$(BIN)$/noarch/fake-db-1.0-0.noarch.rpm +NOARCH=$(BIN)$/noarch +FAKEDB=$(NOARCH)/fake-db-1.0-0.noarch.rpm FAKEDBROOT=$(COMMONMISC)/$(TARGET)/fake-db-root # --- Targets ------------------------------------------------------ @@ -58,7 +59,7 @@ FAKEDBROOT=$(COMMONMISC)/$(TARGET)/fake-db-root .ENDIF # L10N_framework .INCLUDE : target.mk .IF "$(L10N_framework)"=="" -.IF "$(OS)" == "SOLARIS" || "$(OS)" == "LINUX" +.IF "$(OS)" == "SOLARIS" || ( "$(OS)" == "LINUX" && "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)" ) ALLTAR: $(BIN)$/install $(BIN)$/uninstall @@ -69,18 +70,21 @@ $(BIN)$/install: install_$(OS:l).sh .ENDIF .IF "$(OS)" == "LINUX" +.IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)" $(FAKEDB) : fake-db.spec $(MKDIRHIER) $(FAKEDBROOT) $(RPM) --define "_builddir $(shell @cd $(FAKEDBROOT) && pwd)" --define "_rpmdir $(shell @cd $(BIN) && pwd)" -bb $< + chmod g+w $(NOARCH) $(BIN)$/install: $(FAKEDB) +.ENDIF # "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)" $(BIN)$/uninstall: uninstall_linux.sh $(TYPE) $< | tr -d "\015" > $@ -chmod 775 $@ -.ENDIF +.ENDIF # "$(OS)" == "LINUX" .IF "$(OS)" == "SOLARIS" |