From 4e1681aedd011bc3892d1bd4f4db2d423e318b96 Mon Sep 17 00:00:00 2001 From: getafix Date: Sun, 6 Dec 2009 02:28:47 +0000 Subject: [PATCH] Updated default.apspec and Makefile, to comply with revision 2793 folder cleanup. git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2848 127b21dd-08f5-0310-b4b7-95ae10353056 --- Makefile | 2 +- installers/autopackage/default.apspec | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 50b057df..9f9b50f1 100644 --- a/Makefile +++ b/Makefile @@ -78,7 +78,7 @@ remake: clean all # Here are our linux autopackager targets # pkg-autopackage: - makepackage -c -m + makepackage -c -m installers/autopackage/default.apspec # Here are our Debian packager targets # diff --git a/installers/autopackage/default.apspec b/installers/autopackage/default.apspec index 777cbe42..ff992ab9 100644 --- a/installers/autopackage/default.apspec +++ b/installers/autopackage/default.apspec @@ -18,10 +18,7 @@ URL: http://oolite.aegidian.org License: GNU GPL version 2 SoftwareVersion: 1.74 AutopackageTarget: 1.4 -# Uncomment the following line if 'uname -m' gives x86_64 -# CPUArchitectures: x86_64 - -# Put the following line in comments if 'uname -m' is different than x86_64 +# Use 'CPUArchitectures: x86_64' if 'uname -m' gives x86_64 CPUArchitectures: x86 PackageFileName: $SHORTNAME-$SOFTWAREVERSION.$CPUARCHITECTURES.package @@ -43,8 +40,8 @@ profession. Above all, reach the Elite rating. [BuildPrepare] make -f Makefile clean make -f Makefile release -cp FreeDesktop/oolite.desktop $build_root -cp FreeDesktop/oolite-icon.png $build_root +cp installers/FreeDesktop/oolite.desktop $build_root +cp installers/FreeDesktop/oolite-icon.png $build_root cp Doc/AdviceForNewCommanders.pdf $build_root cp Doc/OoliteReadMe.pdf $build_root cp Doc/OoliteRS.pdf $build_root