76 lines
1.2 KiB
Plaintext
76 lines
1.2 KiB
Plaintext
$OpenBSD: patch-configure,v 1.1.1.1 2007/10/07 18:37:01 steven Exp $
|
|
--- configure.orig Tue Jun 5 21:20:28 2007
|
|
+++ configure Thu Sep 20 21:23:06 2007
|
|
@@ -270,71 +270,6 @@ class qc_qtoctavedep : public ConfObj
|
|
EOT
|
|
}
|
|
|
|
-#Builds install-tool
|
|
-export PREFIX
|
|
-export BINDIR
|
|
-export DATADIR
|
|
-export OCTAVEHELP
|
|
-export EX_QTDIR
|
|
-export QC_DEBUG
|
|
-
|
|
-cd install-tool
|
|
-(
|
|
- $qm -project
|
|
- $qm
|
|
- $MAKE
|
|
-)
|
|
-
|
|
-if [ "$?" != "0" ]; then
|
|
- rm -rf .qconftemp
|
|
- if [ "$QC_DEBUG" = "Y" ]; then
|
|
- echo " -> fail"
|
|
- else
|
|
- echo "fail"
|
|
- fi
|
|
- printf "\n"
|
|
- printf "Reason: There was an error compiling 'conf'. See conf.log for details.\n"
|
|
- printf "\n"
|
|
- show_qt_info
|
|
- if [ "$QC_DEBUG" = "Y" ]; then
|
|
- echo "conf.log:"
|
|
- cat conf.log
|
|
- fi
|
|
- exit 1;
|
|
-fi
|
|
-
|
|
-cd ..
|
|
-
|
|
-#Export variables for install-tool
|
|
-
|
|
-QC_COMMAND=$0
|
|
-export QC_COMMAND
|
|
-QMAKE=$qm
|
|
-export QMAKE
|
|
-MAKETOOL=$MAKE
|
|
-export MAKETOOL
|
|
-
|
|
-
|
|
-install-tool/install-tool $ASSISTANT
|
|
-ret="$?"
|
|
-if [ "$ret" = "1" ]; then
|
|
- echo
|
|
- exit 1;
|
|
-else
|
|
- if [ "$ret" != "0" ]; then
|
|
- if [ "$QC_DEBUG" = "Y" ]; then
|
|
- echo " -> fail"
|
|
- else
|
|
- echo "fail"
|
|
- fi
|
|
- echo
|
|
- echo "Reason: Unexpected error launching 'conf'"
|
|
- echo
|
|
- exit 1;
|
|
- fi
|
|
-fi
|
|
-
|
|
-
|
|
echo
|
|
echo "Good, your configure finished. Now run $MAKE."
|
|
echo
|