diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-06-17 13:12:31 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-06-17 13:12:31 +0000 |
| commit | 27c6920a0a1423678b5e74d5d315487724640865 (patch) | |
| tree | e1926d0488c4aa306523901a6613de110ec402d4 /setup_native/scripts/makefile.mk | |
| parent | 5e7318edfe40c34bffc5e412e45a206bea06938c (diff) | |
INTEGRATION: CWS nativefixer10 (1.6.12); FILE MERGED
2005/06/14 08:59:59 obr 1.6.12.4: #123452# no more admin file
2005/06/13 13:43:56 obr 1.6.12.3: #123452# teach user install scripts to install patches as well
2005/06/09 11:59:51 obr 1.6.12.2: #123452# install script on linux now allows updates too
2005/06/07 14:21:50 is 1.6.12.1: #123452# patch userland script
Diffstat (limited to 'setup_native/scripts/makefile.mk')
| -rw-r--r-- | setup_native/scripts/makefile.mk | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/setup_native/scripts/makefile.mk b/setup_native/scripts/makefile.mk index ffb368d6368d..402f5d11546a 100644 --- a/setup_native/scripts/makefile.mk +++ b/setup_native/scripts/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: obo $ $Date: 2005-04-20 11:40:49 $ +# last change: $Author: rt $ $Date: 2005-06-17 14:12:31 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -82,28 +82,29 @@ UNIXTEXT= \ .IF "$(OS)" == "LINUX" -ALLTAR : $(BIN)$/install $(BIN)$/uninstall +ALLTAR : $(BIN)$/install $(BIN)$/uninstall $(BIN)$/install: install_linux.sh $(TYPE) $< | tr -d "\015" > $@ ; chmod 775 $@ $(BIN)$/uninstall: uninstall_linux.sh $(TYPE) $< | tr -d "\015" > $@ ; chmod 775 $@ - + .ENDIF .IF "$(OS)" == "SOLARIS" -ALLTAR: $(BIN)$/install $(BIN)$/uninstall $(BIN)$/admin +ALLTAR: $(BIN)$/install $(BIN)$/uninstall $(LB)$/getuid.so.stripped -$(BIN)$/install: install_solaris.sh - $(PERL) install_create.pl install_$(OS).sh $(LB)$/getuid.so $(BIN)$/install ; chmod 775 $(BIN)$/install +$(BIN)$/install: install_solaris.sh $(LB)$/getuid.so.stripped + $(PERL) install_create.pl install_$(OS).sh $(LB)$/getuid.so.stripped $(BIN)$/install ; chmod 775 $(BIN)$/install -$(BIN)$/uninstall: uninstall_solaris.sh - $(PERL) install_create.pl uninstall_$(OS).sh $(LB)$/getuid.so $(BIN)$/uninstall ; chmod 775 $(BIN)$/install +$(BIN)$/uninstall: uninstall_solaris.sh $(LB)$/getuid.so.stripped + $(PERL) install_create.pl uninstall_$(OS).sh $(LB)$/getuid.so.stripped $(BIN)$/uninstall ; chmod 775 $(BIN)$/install -$(BIN)$/admin: admin - $(COPY) $< $@ +$(LB)$/getuid.so.stripped: $(LB)$/getuid.so + @$(COPY) $< $@ + @/usr/ccs/bin/strip $@ .ENDIF |