diff --git a/Makefile b/Makefile index 52cd516547..a1f1b9e7f7 100644 --- a/Makefile +++ b/Makefile @@ -115,6 +115,7 @@ install: all @cp *.ttf $(INSTALL_DIR) @cp --parents -r thirdparty/Tao $(INSTALL_DIR) @$(INSTALL_PROGRAM) thirdparty/WindowsBase.dll $(INSTALL_DIR) + @-$(INSTALL_PROGRAM) VERSION $(INSTALL_DIR) @echo "#!/bin/sh" > openra @echo "cd "$(datadir)"/openra" >> openra @@ -123,8 +124,8 @@ install: all @$(INSTALL_PROGRAM) -m +rx openra $(BIN_INSTALL_DIR) @echo "OpenRA is now installed. You will now want to download" - @echo "http://open-ra.org/packages/ra-packages.php and" - @echo "http://open-ra.org/packages/cnc-packages.php" + @echo "http://open-ra.org/get-dependency.php?ra-packages and" + @echo "http://open-ra.org/get-dependency.php?cnc-packages" @echo "and extract their contents to" @echo "$(INSTALL_DIR)/mods/ra/packages and " @echo "$(INSTALL_DIR)/mods/cnc/packages respectively." diff --git a/packaging/osx/package-game.sh b/packaging/osx/package-game.sh index ffe531ddb8..c34ac5f266 100755 --- a/packaging/osx/package-game.sh +++ b/packaging/osx/package-game.sh @@ -26,7 +26,6 @@ for i in $EXCLUDE; do find . -path "$i" -delete done -git describe --tags > "VERSION" cd $PACKAGING_PATH zip OpenRA-$2 -r -9 OpenRA.app echo "Done!" diff --git a/packaging/package-all.sh b/packaging/package-all.sh index ed6051df8a..8090d4a1f3 100755 --- a/packaging/package-all.sh +++ b/packaging/package-all.sh @@ -46,6 +46,8 @@ if [ $? -ne 0 ]; then exit 1 fi +git describe --tags > "VERSION" + msg "\E[32m" "Starting make..." make prefix=/usr DESTDIR=../built install if [ $? -ne 0 ]; then