diff options
| author | Brice Goglin <bgoglin@debian.org> | 2007-11-11 11:49:16 +0100 |
|---|---|---|
| committer | Brice Goglin <bgoglin@debian.org> | 2007-11-11 11:49:16 +0100 |
| commit | 5cedd4a43e162da644360e1cbb390dcf03285723 (patch) | |
| tree | 2fb4e47e6c913424ec4fc74f805954e6d61219b8 | |
| parent | 0595d32d8af331fffb616011a22ebe888cb05158 (diff) | |
Remove DESTDIR from INSTALL_DIR in configs/debian-default
... and update 03_optional-progs-and-install.patch accordingly.
| -rw-r--r-- | configs/debian-default | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/03_optional-progs-and-install.patch | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/configs/debian-default b/configs/debian-default index aa4721a9ee4..f80ec30f0b6 100644 --- a/configs/debian-default +++ b/configs/debian-default @@ -12,7 +12,7 @@ EXTRA_LIB_PATH = SRC_DIRS = mesa PROGRAM_DIRS = -INSTALL_DIR = $(DESTDIR)/usr +INSTALL_DIR = /usr # vim: ft=make diff --git a/debian/changelog b/debian/changelog index f38deceba56..418d5a01210 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ mesa (7.0.2-1) UNRELEASED; urgency=low built when building progs/xdemos. + Refresh 04_cleanup-osmesa-configs.patch. + Drop 05_static-nonpic.patch,, applied upstream. + + Remove DESTDIR from INSTALL_DIR in configs/debian-default since + the upstream Makefiles now support DESTDIR. -- Brice Goglin <bgoglin@debian.org> Sun, 11 Nov 2007 00:25:31 +0100 diff --git a/debian/patches/03_optional-progs-and-install.patch b/debian/patches/03_optional-progs-and-install.patch index c5f8b12e84f..f802a429601 100644 --- a/debian/patches/03_optional-progs-and-install.patch +++ b/debian/patches/03_optional-progs-and-install.patch @@ -34,8 +34,8 @@ Index: mesa/progs/xdemos/Makefile default: $(PROGS) +install: $(PROGS) -+ $(INSTALL) -d $(INSTALL_DIR)/bin -+ $(INSTALL) -m 755 $(PROGS) $(INSTALL_DIR)/bin ++ $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/bin ++ $(INSTALL) -m 755 $(PROGS) $(DESTDIR)$(INSTALL_DIR)/bin clean: -rm -f $(PROGS) |