set the distribution environment variable before configure step.

diff --git a/debian/rules b/debian/rules
index e3493c2773b2c057c114147e308fc8f458af968f..0c1cfe7c89ad0eba4582d78f57907bd2eb20a5f7 100755 (executable)
--- 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 dcccaeb53b9c819f5359dc4ec97b7dbdebdaf5a2..75f975358d003f97edfb6bc1919666ab593d2bfe 100644 (file)
--- 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)