[pkg-fgfs-crew] r218 - /flightgear/trunk/debian/rules

ovek at users.alioth.debian.org ovek at users.alioth.debian.org
Tue Jul 17 01:34:38 UTC 2012


Author: ovek
Date: Tue Jul 17 01:34:37 2012
New Revision: 218

URL: http://svn.debian.org/wsvn/pkg-fgfs/?sc=1&rev=218
Log:
Install binaries into /usr/games as before.

Modified:
    flightgear/trunk/debian/rules

Modified: flightgear/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-fgfs/flightgear/trunk/debian/rules?rev=218&op=diff
==============================================================================
--- flightgear/trunk/debian/rules (original)
+++ flightgear/trunk/debian/rules Tue Jul 17 01:34:37 2012
@@ -15,9 +15,11 @@
 MAKEFLAGS += -j$(NUMJOBS)
 endif
 
-CMAKE_FLAGS=-DCMAKE_INSTALL_PREFIX=/usr \
-	-DFG_DATA_DIR=/usr/share/games/flightgear \
-	-DSIMGEAR_SHARED=ON \
+CMAKE_FLAGS = \
+	-DCMAKE_INSTALL_PREFIX:PATH=/usr \
+	-DCMAKE_INSTALL_BINDIR:PATH=games \
+	-DFG_DATA_DIR:PATH=/usr/share/games/flightgear \
+	-DSIMGEAR_SHARED:BOOL=ON \
 	-DJPEG_FACTORY=ON \
 	-DENABLE_FGADMIN=OFF \
 	-DENABLE_LARCSIM=ON \
@@ -31,7 +33,7 @@
 	mkdir build
 	cd build && \
 	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)" \
-	cmake .. $(CMAKE_FLAGS) -LH
+	cmake .. $(CMAKE_FLAGS)
 
 	touch configure-stamp
 
@@ -56,9 +58,15 @@
 	dh_testdir
 	dh_testroot
 	dh_prep
+	dh_installdirs
 
 	cd build && \
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/flightgear
+
+	# the CMAKE_INSTALL_BINDIR might be ignored
+	if [ -d debian/flightgear/usr/bin ]; then \
+	  mv debian/flightgear/usr/bin/* debian/flightgear/usr/games; \
+	fi
 
 # Build architecture-independent files here.
 binary-indep: build install




More information about the pkg-fgfs-crew mailing list