[Pkg-cyrus-sasl2-commits] r577 - /cyrus-sasl-2.1/branches/package-consolidate/debian/rules

[roberto at users.alioth.debian.org]

Author: roberto
Date: Sat Aug 21 02:07:06 2010
New Revision: 577

URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=577
Log:
clean up debian/rules

Modified:
    cyrus-sasl-2.1/branches/package-consolidate/debian/rules

Modified: cyrus-sasl-2.1/branches/package-consolidate/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/package-consolidate/debian/rules?rev=577&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/package-consolidate/debian/rules (original)
+++ cyrus-sasl-2.1/branches/package-consolidate/debian/rules Sat Aug 21 02:07:06 2010
@@ -178,13 +178,6 @@
 	       --sysconfdir=/etc \
 	       --with-devrandom=/dev/urandom; \
 	cd ..)
-	# Cope with the way that ./configure creates symlinks
-	cp $(CURDIR)/sasldb/* $(TMPBUILD_MIT)/sasldb/
-	cp $(CURDIR)/plugins/* $(TMPBUILD_MIT)/plugins/
-	cp $(CURDIR)/lib/* $(TMPBUILD_MIT)/lib/
-	cp -d $(TMPBUILD_MIT)/sasldb/* $(CURDIR)/sasldb/
-	cp -d $(TMPBUILD_MIT)/plugins/* $(CURDIR)/plugins/
-	cp -d $(TMPBUILD_MIT)/lib/* $(CURDIR)/lib/
 	(mkdir $(TMPBUILD_HEIMDAL); cd $(TMPBUILD_HEIMDAL); \
 	LDFLAGS="$(LDFLAGS) -L/usr/lib/heimdal -Wl,-z,defs" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS) -I/usr/include/heimdal" ../configure \
 	       --host=$(DEB_HOST_GNU_TYPE) \
@@ -222,13 +215,6 @@
 	       --sysconfdir=/etc \
 	       --with-devrandom=/dev/urandom; \
 	cd ..)
-	# Cope with the way that ./configure creates symlinks
-	cp $(CURDIR)/sasldb/* $(TMPBUILD_HEIMDAL)/sasldb/
-	cp $(CURDIR)/plugins/* $(TMPBUILD_HEIMDAL)/plugins/
-	cp $(CURDIR)/lib/* $(TMPBUILD_HEIMDAL)/lib/
-	cp -d $(TMPBUILD_HEIMDAL)/sasldb/* $(CURDIR)/sasldb/
-	cp -d $(TMPBUILD_HEIMDAL)/plugins/* $(CURDIR)/plugins/
-	cp -d $(TMPBUILD_HEIMDAL)/lib/* $(CURDIR)/lib/
 
 	# Prepare to build sample-{client,server}
 	cp -f $(CURDIR)/debian/sample/config.h $(CURDIR)/sample/config.h
@@ -251,10 +237,10 @@
 	# Certain symlinks get created too late, resulting in a
 	# build failure. We work around this by running make twice,
 	# ignoring the first failure.
-	-(cd $(TMPBUILD_MIT); LDFLAGS="$(LDFLAGS) -L/usr/lib/mit-krb5 -Wl,-z,defs" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS) -I/usr/include/mit-krb5" $(MAKE);)
-	(cd $(TMPBUILD_MIT); LDFLAGS="$(LDFLAGS) -L/usr/lib/mit-krb5 -Wl,-z,defs" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS) -I/usr/include/mit-krb5" $(MAKE);)
-	-(cd $(TMPBUILD_HEIMDAL); LDFLAGS="$(LDFLAGS) -L/usr/lib/heimdal -Wl,-z,defs" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS) -I/usr/include/heimdal" $(MAKE);)
-	(cd $(TMPBUILD_HEIMDAL); LDFLAGS="$(LDFLAGS) -L/usr/lib/heimdal -Wl,-z,defs" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS) -I/usr/include/heimdal" $(MAKE);)
+	-(cd $(TMPBUILD_MIT); $(MAKE);)
+	(cd $(TMPBUILD_MIT); $(MAKE);)
+	-(cd $(TMPBUILD_HEIMDAL); $(MAKE);)
+	(cd $(TMPBUILD_HEIMDAL); $(MAKE);)
 
 	# Build sample-{client,server}
 	make -f $(CURDIR)/debian/sample/Makefile -C $(CURDIR)/sample T=$(CURDIR)