diff --git a/packaging/linux/rpm/openra.spec b/packaging/linux/rpm/openra.spec index 05145edd18..1ceb22b6f6 100644 --- a/packaging/linux/rpm/openra.spec +++ b/packaging/linux/rpm/openra.spec @@ -23,11 +23,10 @@ and includes Command & Conquer as an official mod. %setup -n %{folder} %build -make prefix="$RPM_BUILD_ROOT/usr" %install rm -rf $RPM_BUILD_ROOT -make prefix="$RPM_BUILD_ROOT/usr" install +cp -r ~/openra-package/built/usr/ $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT diff --git a/packaging/package-all.sh b/packaging/package-all.sh index 6a76a7b7dc..b17d3b5ddf 100755 --- a/packaging/package-all.sh +++ b/packaging/package-all.sh @@ -33,8 +33,14 @@ make prefix=/usr DESTDIR=../built install popd popd -cd linux/pkgbuild/ +pushd linux/pkgbuild/ sh buildpackage.sh "ftp.open-ra.org" "httpdocs/releases/linux" "$2" "$3" "$VERSION" +popd -#cd ../rpm/ -#sh buildpackage.sh "ftp.open-ra.org" "httpdocs/releases/linux" "$2" "$3" "$VERSION" "~/rpmbuild" +pushd linux/rpm/ +sh buildpackage.sh "ftp.open-ra.org" "httpdocs/releases/linux" "$2" "$3" "$VERSION" "~/rpmbuild" +popd + +pushd osx/ +#todo +popd