diff options
| author | Nathan Scott <nathans@sgi.com> | 2001-01-25 06:56:37 +0000 |
|---|---|---|
| committer | Nathan Scott <nathans@sgi.com> | 2001-01-25 06:56:37 +0000 |
| commit | e934a24594e2518b8ae51c3280e9fa68893df26f (patch) | |
| tree | d20a83d4bb9e9cdcaf9017706e68fda03f607647 | |
| parent | 1769c1bd6d99338432f29764777f1119ffb2455d (diff) | |
| download | dmapi-dev-e934a24594e2518b8ae51c3280e9fa68893df26f.tar.gz | |
set the distribution environment variable before configure step.
| -rwxr-xr-x | debian/rules | 3 | ||||
| -rw-r--r-- | doc/Makefile | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/debian/rules b/debian/rules index eeb38c1..8f0b348 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 d320b35..8ee4ec9 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 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 $(PKG_DOC_DIR) |