epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes to include extra mod dirs in Makefile and correct paths in post install scripts.

Browse Source
This commit is contained in:
Matthew
2010-08-06 14:03:37 +12:00
parent aee0728a73
commit 609abb7719
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -102,15 +102,17 @@ install: all
@$(INSTALL_PROGRAM) $(cnc_TARGET) $(INSTALL_DIR)/mods/cnc @$(INSTALL_PROGRAM) $(cnc_TARGET) $(INSTALL_DIR)/mods/cnc
@-cp $(foreach f,$(shell ls mods/cnc --hide=*.dll),mods/cnc/$(f)) $(INSTALL_DIR)/mods/cnc @-cp $(foreach f,$(shell ls mods/cnc --hide=*.dll),mods/cnc/$(f)) $(INSTALL_DIR)/mods/cnc
@cp -r mods/cnc/maps $(INSTALL_DIR)/mods/cnc @cp -r mods/cnc/maps $(INSTALL_DIR)/mods/cnc
@cp -r mods/cnc/chrome $(INSTALL_DIR)/mods/cnc
@$(INSTALL_PROGRAM) -d $(INSTALL_DIR)/mods/ra @$(INSTALL_PROGRAM) -d $(INSTALL_DIR)/mods/ra
@$(INSTALL_PROGRAM) $(ra_TARGET) $(INSTALL_DIR)/mods/ra @$(INSTALL_PROGRAM) $(ra_TARGET) $(INSTALL_DIR)/mods/ra
@-cp $(foreach f,$(shell ls mods/ra --hide=*.dll),mods/ra/$(f)) $(INSTALL_DIR)/mods/ra @-cp $(foreach f,$(shell ls mods/ra --hide=*.dll),mods/ra/$(f)) $(INSTALL_DIR)/mods/ra
@cp -r mods/ra/maps $(INSTALL_DIR)/mods/ra @cp -r mods/ra/maps $(INSTALL_DIR)/mods/ra
@cp -r mods/ra/extras $(INSTALL_DIR)/mods/ra
@cp -r mods/ra/chrome $(INSTALL_DIR)/mods/ra
@cp -r shaders $(INSTALL_DIR) @cp -r shaders $(INSTALL_DIR)
@cp *.ttf $(INSTALL_DIR) @cp *.ttf $(INSTALL_DIR)
@-cp *.ini $(INSTALL_DIR)
@cp -r thirdparty $(INSTALL_DIR) @cp -r thirdparty $(INSTALL_DIR)
@echo "#!/bin/sh" > openra @echo "#!/bin/sh" > openra

4
packaging/linux/pkgbuild/openra.install
View File

@@ -20,7 +20,9 @@ post_install() {
read -s -n1 -p "Download and install RA packages? [Y/n]" read -s -n1 -p "Download and install RA packages? [Y/n]"
case $REPLY in case $REPLY in
y|Y|"") y|Y|"")
pushd /tmp/
install_ra_packages install_ra_packages
popd
break;; break;;
n|N) break;; n|N) break;;
*) echo "Please enter y or n.";; *) echo "Please enter y or n.";;
@@ -32,7 +34,9 @@ post_install() {
read -s -n1 -p "Download and install C&C packages? [Y/n]" read -s -n1 -p "Download and install C&C packages? [Y/n]"
case $REPLY in case $REPLY in
y|Y|"") y|Y|"")
pushd /tmp/
install_cnc_packages install_cnc_packages
popd
break;; break;;
n|N) break;; n|N) break;;
*) echo "Please enter y or n.";; *) echo "Please enter y or n.";;

4
packaging/linux/rpm/openra.spec
View File

@@ -39,10 +39,12 @@ do
read -s -n1 -p "Download and install RA packages? [Y/n]" read -s -n1 -p "Download and install RA packages? [Y/n]"
case $REPLY in case $REPLY in
y|Y|"") y|Y|"")
pushd /tmp/
wget http://open-ra.org/packages/ra-packages.zip wget http://open-ra.org/packages/ra-packages.zip
mkdir -p $RPM_BUILD_ROOT/usr/share/openra/mods/ra/packages mkdir -p $RPM_BUILD_ROOT/usr/share/openra/mods/ra/packages
unzip ra-packages.zip -d $RPM_BUILD_ROOT/usr/share/openra/mods/ra/packages unzip ra-packages.zip -d $RPM_BUILD_ROOT/usr/share/openra/mods/ra/packages
rm ra-packages.zip rm ra-packages.zip
popd
break;; break;;
n|N) break;; n|N) break;;
*) echo "Please enter y or n.";; *) echo "Please enter y or n.";;
@@ -54,10 +56,12 @@ do
read -s -n1 -p "Download and install C&C packages? [Y/n]" read -s -n1 -p "Download and install C&C packages? [Y/n]"
case $REPLY in case $REPLY in
y|Y|"") y|Y|"")
pushd /tmp/
wget http://open-ra.org/packages/cnc-packages.zip wget http://open-ra.org/packages/cnc-packages.zip
mkdir -p $RPM_BUILD_ROOT/usr/share/openra/mods/cnc/packages mkdir -p $RPM_BUILD_ROOT/usr/share/openra/mods/cnc/packages
unzip ra-packages.zip -d $RPM_BUILD_ROOT/usr/share/openra/mods/cnc/packages unzip ra-packages.zip -d $RPM_BUILD_ROOT/usr/share/openra/mods/cnc/packages
rm ra-packages.zip rm ra-packages.zip
popd
break;; break;;
n|N) break;; n|N) break;;
*) echo "Please enter y or n.";; *) echo "Please enter y or n.";;