[Pkg-mc-commits] r402 - trunk/debian

[Yury Zaytsev]

Author: zaytsev-guest
Date: 2010-05-07 19:12:39 +0000 (Fri, 07 May 2010)
New Revision: 402

Modified:
   trunk/debian/rules
Log:
Remove obsolete rules (we don't need to regenerate the buildsys
anymore), update rules for cons.saver, fix ./configure options.



Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2010-05-07 19:10:48 UTC (rev 401)
+++ trunk/debian/rules	2010-05-07 19:12:39 UTC (rev 402)
@@ -4,26 +4,15 @@
 include /usr/share/cdbs/1/class/autotools.mk
 
 DEB_DH_STRIP_ARGS := --dbg-package=mc-dbg
-DEB_CONFIGURE_EXTRA_FLAGS := --without-ext2undel --without-samba --with-screen=slang --disable-rpath
+DEB_CONFIGURE_EXTRA_FLAGS := --without-ext2undel --without-samba --with-x --with-screen=slang --libexecdir='$${prefix}/lib' --disable-rpath
 AWK := awk
 
-# Use building with n parallel processes with DEB_BUILD_OPTIONS=parallel=n
+# If DEB_BUILD_OPTIONS=parallel=n, build in n parallel processes
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-MAKEFLAGS += -j$(NUMJOBS)
+	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+	MAKEFLAGS += -j$(NUMJOBS)
 endif
 
-
-cleanbuilddir/mc::
-	rm -f po/*.gmo
-	rm -f po/stamp-po
-	rm -f NEWS
-	rm -f README
-	rm -f config.log
-
-makebuilddir/mc::
-	if [ ! -f configure ]; then sh autogen.sh; fi
-
 install/mc::
 	cp ./debian/extra/icon.xpm ./debian/mc/usr/share/pixmaps/mc.xpm
 
@@ -31,4 +20,10 @@
 	chmod 644 ./debian/mc/usr/share/mc/bin/mc*
 	chmod 755 ./debian/mc/etc/mc/edit.spell.rc
 	chmod 755 ./debian/mc/etc/mc/edit.indent.rc
+
+ifeq ($(DEB_HOST_ARCH_OS), linux)
+	chgrp tty ./debian/mc/usr/lib/mc/cons.saver
+	chmod g+s ./debian/mc/usr/lib/mc/cons.saver
+endif
+
 	rmdir ./debian/mc/usr/share/man/sr/man8