From ccc86cfaf87bfcde13839e94a0d9fac3590c363f Mon Sep 17 00:00:00 2001 From: "gregory.hainaut@gmail.com" Date: Sat, 12 Feb 2011 10:40:26 +0000 Subject: [PATCH] debian: update the package with new cmake PACKAGE_MODE option git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4290 96395faa-99c1-11dd-bbfe-3dabce05a288 --- .../patches/01_rename_binary_generated.patch | 24 ------------------- debian-unstable-upstream/patches/series | 1 - debian-unstable-upstream/rules | 2 ++ 3 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 debian-unstable-upstream/patches/01_rename_binary_generated.patch diff --git a/debian-unstable-upstream/patches/01_rename_binary_generated.patch b/debian-unstable-upstream/patches/01_rename_binary_generated.patch deleted file mode 100644 index a64e73e445..0000000000 --- a/debian-unstable-upstream/patches/01_rename_binary_generated.patch +++ /dev/null @@ -1,24 +0,0 @@ -Debian specific -Always uses the same executable name for the build. Easier for the install script -Index: pcsx2.snapshot-3567/pcsx2/CMakeLists.txt -=================================================================== ---- pcsx2.snapshot-3567.orig/pcsx2/CMakeLists.txt -+++ pcsx2.snapshot-3567/pcsx2/CMakeLists.txt -@@ -72,7 +72,7 @@ - if(CMAKE_BUILD_TYPE STREQUAL Debug) - - # executable name -- set(Output pcsx2-dbg) -+ set(Output pcsx2) - - # add defines - add_definitions(${CommonFlags} ${DebugFlags} -DPCSX2_DEVBUILD -DPCSX2_DEBUG -DWX_PRECOMP) -@@ -82,7 +82,7 @@ - if(CMAKE_BUILD_TYPE STREQUAL Devel) - - # executable name -- set(Output pcsx2-dev) -+ set(Output pcsx2) - - # add defines - add_definitions(${CommonFlags} ${OptimizationFlags} -DPCSX2_DEVBUILD -DWX_PRECOMP -DNDEBUG) diff --git a/debian-unstable-upstream/patches/series b/debian-unstable-upstream/patches/series index ca3eb71490..6531bbd755 100644 --- a/debian-unstable-upstream/patches/series +++ b/debian-unstable-upstream/patches/series @@ -1,3 +1,2 @@ -01_rename_binary_generated.patch 02_update_default_path.patch 05_move_data_to_config.patch diff --git a/debian-unstable-upstream/rules b/debian-unstable-upstream/rules index 00eeeddde5..2c18a6a600 100755 --- a/debian-unstable-upstream/rules +++ b/debian-unstable-upstream/rules @@ -33,6 +33,8 @@ build-stamp: -DL10N_PORTABLE=FALSE \ -DUSER_CMAKE_C_FLAGS:STRING="$(USER_CFLAGS)" \ -DUSER_CMAKE_CXX_FLAGS:STRING="$(USER_CXXFLAGS)" + -DCMAKE_INSTALL_PREFIX="/usr" \ + -DPACKAGE_MODE=TRUE $(MAKE) $(MAKEFLAGS) touch build-stamp