Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

configure-mac: configure build on Linux, too

rename configure-mac to configure-unix.

Makefile: delete local-config.mk for clean target
  • Loading branch information...
commit b8d4130115ec72c30fd552a4a835f4e8acf0bd33 1 parent 5fc076d
@davidswelt authored
View
1  Makefile
@@ -826,6 +826,7 @@ everything: $(OUTPUTS) debug build-check build-harness
clean: FORCE
@$(NQ)echo "cleaning all"
+ $(Q)rm -rf build/local-config.mk
$(Q)rm -rf $(OUT)
$(RM) $(BUILDTESTS)
View
4 build/configure-mac.sh → build/configure-unix.sh
@@ -17,9 +17,9 @@
# Test if running on a Mac
-if [ "`uname -s`" != "Darwin" ];
+if [ "`uname -s`" != "Darwin" -a "`uname -s`" != "Linux" ];
then
- echo "Not running on Mac OS X. Automatic configuration not available."
+ echo "Not running on Linux or Mac OS X. Automatic configuration not available."
exit 0
fi
View
17 configure
@@ -3,17 +3,14 @@
DIR=`dirname $0`
SYSTEM=`uname -s 2>/dev/null`
-# Test if running on a Mac
+# Test if running on a Mac or Linux machine:
case "${SYSTEM}" in
-"Darwin")
- ${DIR}/build/configure-mac.sh \
- && echo "Now run
- make TARGET=UNIX
-to build XCSoar for Mac OS X."
-;;
-*)
- echo "Now run
+"Darwin" | "Linux")
+ ${DIR}/build/configure-unix.sh
+ ;;
+esac
+
+echo "Now run
make TARGET=<t>
to build XCSoar. See README for valid targets."
-esac
Please sign in to comment.
Something went wrong with that request. Please try again.