diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-11-20 15:36:10 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-11-20 15:36:10 +0000 |
| commit | d480a8c91d98d850d9d969c7d642af839a6d0d9a (patch) | |
| tree | f4acc52ba70237527f405accbbece984cbb69c0b /setup_native/scripts | |
| parent | c765b4858941f748fd5ed521e10123c505db5216 (diff) | |
CWS-TOOLING: integrate CWS native207_DEV300
Diffstat (limited to 'setup_native/scripts')
| -rw-r--r-- | setup_native/scripts/langpackscript.sh | 28 | ||||
| -rw-r--r-- | setup_native/scripts/makefile.mk | 4 |
2 files changed, 17 insertions, 15 deletions
diff --git a/setup_native/scripts/langpackscript.sh b/setup_native/scripts/langpackscript.sh index f67b21f1aa86..bf221909ebf4 100644 --- a/setup_native/scripts/langpackscript.sh +++ b/setup_native/scripts/langpackscript.sh @@ -46,28 +46,30 @@ done case $platform in SunOS) - SEARCHPACKAGENAME="openofficeorg-core01" + SEARCHPACKAGENAME="BASISPACKAGEPREFIXPLACEHOLDEROOOBASEVERSIONPLACEHOLDER-core01" echo - echo "Searching for the $SEARCHPACKAGENAME installation ..." + echo "Searching for the FULLPRODUCTNAMELONGPLACEHOLDER installation ..." PACKAGENAME=`pkginfo -x | grep $SEARCHPACKAGENAME | sed "s/ .*//"` if [ "x$PACKAGENAME" != "x" ] then PRODUCTINSTALLLOCATION="`pkginfo -r $PACKAGENAME`" else - PRODUCTINSTALLLOCATION="" + echo "FULLPRODUCTNAMELONGPLACEHOLDER not installed (no package $SEARCHPACKAGENAME installed)" + exit 1 fi ;; Linux) - SEARCHPACKAGENAME="openoffice.org-core01" + SEARCHPACKAGENAME="BASISPACKAGEPREFIXPLACEHOLDEROOOBASEVERSIONPLACEHOLDER-core01" FIXPATH="/openoffice.org" echo - echo "Searching for the $SEARCHPACKAGENAME installation ..." + echo "Searching for the FULLPRODUCTNAMELONGPLACEHOLDER installation ..." RPMNAME=`rpm -qa | grep $SEARCHPACKAGENAME` if [ "x$RPMNAME" != "x" ] then PRODUCTINSTALLLOCATION="`rpm -ql $RPMNAME | head -n 1`" else - PRODUCTINSTALLLOCATION="" + echo "FULLPRODUCTNAMELONGPLACEHOLDER not installed (no package $SEARCHPACKAGENAME installed)" + exit 1 fi PRODUCTINSTALLLOCATION=`echo $PRODUCTINSTALLLOCATION | sed "s#${FIXPATH}##"` ;; @@ -79,13 +81,13 @@ esac # Asking for the installation directory -echo -echo "Where do you want to install the language pack ? [$PRODUCTINSTALLLOCATION] " -read reply leftover -if [ "x$reply" != "x" ] -then - PRODUCTINSTALLLOCATION="$reply" -fi +# echo +# echo "Where do you want to install the language pack ? [$PRODUCTINSTALLLOCATION] " +# read reply leftover +# if [ "x$reply" != "x" ] +# then +# PRODUCTINSTALLLOCATION="$reply" +# fi # Unpacking diff --git a/setup_native/scripts/makefile.mk b/setup_native/scripts/makefile.mk index de4a41dd5aab..c1df2ff56026 100644 --- a/setup_native/scripts/makefile.mk +++ b/setup_native/scripts/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.18 $ +# $Revision: 1.18.112.1 $ # # This file is part of OpenOffice.org. # @@ -75,7 +75,7 @@ $(BIN)$/install: install_$(OS:l).sh $(FAKEDB) : fake-db.spec $(MKDIRHIER) $(FAKEDBROOT) - $(RPM) --define "_builddir $(shell @cd $(FAKEDBROOT) && pwd)" --define "_rpmdir $(BIN)" -bb $< + $(RPM) --define "_builddir $(shell @cd $(FAKEDBROOT) && pwd)" --define "_rpmdir $(shell @cd $(BIN) && pwd)" -bb $< $(BIN)$/install: $(FAKEDB) |