From: Nathan Scott Date: Thu, 25 Jan 2001 06:56:37 +0000 (+0000) Subject: set the distribution environment variable before configure step. X-Git-Tag: v1.2.0~42 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba917f38307ed733dd71200b1067bb37bf59515c;p=thirdparty%2Fxfsprogs-dev.git set the distribution environment variable before configure step. --- diff --git a/debian/rules b/debian/rules index e3493c277..0c1cfe7c8 100755 --- a/debian/rules +++ b/debian/rules @@ -11,7 +11,8 @@ pkgtmp = DIST_ROOT=`pwd`/$(dirtmp); export DIST_ROOT; pkgdev = DIST_ROOT=`pwd`/$(dirdev); export DIST_ROOT; stdenv = GZIP=-q; export GZIP; -options = DEBUG="-DNDEBUG"; OPTIMIZER="-O1 -g"; export DEBUG OPTIMIZER; +options = DEBUG="-DNDEBUG"; OPTIMIZER="-O1 -g"; DISTRIBUTION="debian"; \ + export DEBUG OPTIMIZER DISTRIBUTION; checkdir = test -f debian/rules build: built diff --git a/doc/Makefile b/doc/Makefile index dcccaeb53..75f975358 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -33,9 +33,6 @@ TOPDIR = .. include $(TOPDIR)/include/builddefs -# [don't install COPYING for Debian builds - use Debian preferred method] -HAVE_DEBIAN = $(shell test -f /etc/debian_version && echo yes || echo no) - LSRCFILES = INSTALL PORTING CHANGES COPYING CREDITS README.LVM LDIRT = *.gz @@ -48,7 +45,7 @@ CHANGES.gz: install: default $(INSTALL) -m 755 -d $(PKG_DOC_DIR) -ifeq ($(HAVE_DEBIAN), no) +ifneq ($(PKG_DISTRIBUTION), debian) $(INSTALL) -m 644 COPYING $(PKG_DOC_DIR) endif $(INSTALL) -m 644 PORTING CHANGES.gz CREDITS README.LVM $(PKG_DOC_DIR)