浏览代码

debian: Use an intermediate variable to hold debian/tmp

Guillem Jover 11 年之前
父节点
当前提交
56a777da0b
共有 1 个文件被更改,包括 4 次插入2 次删除
  1. 4 2
      debian/rules

+ 4 - 2
debian/rules

@@ -37,6 +37,8 @@ ifeq (,$(filter maintainer-build,$(DEB_BUILD_OPTIONS)))
 	confflags += --disable-silent-rules
 	confflags += --disable-silent-rules
 endif
 endif
 
 
+D := $(CURDIR)/debian/tmp
+
 # Create configure script if necessary, automake handles rebuilding it.
 # Create configure script if necessary, automake handles rebuilding it.
 configure:
 configure:
 	dh_testdir
 	dh_testdir
@@ -82,13 +84,13 @@ install: check
 	dh_prep
 	dh_prep
 	dh_installdirs
 	dh_installdirs
 
 
-	cd build-tree && $(MAKE) DESTDIR="$(CURDIR)/debian/tmp" install
+	cd build-tree && $(MAKE) DESTDIR=$(D) install
 
 
 ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
 ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
 	# Ubuntu's «i386» architecture is built for i686 (the Debian default
 	# Ubuntu's «i386» architecture is built for i686 (the Debian default
 	# is i586).
 	# is i586).
 	sed -ri 's/^(i386[[:space:]]+)[^[:space:]]+/\1i686/' \
 	sed -ri 's/^(i386[[:space:]]+)[^[:space:]]+/\1i686/' \
-	        $(CURDIR)/debian/tmp/usr/share/dpkg/cputable
+	        $(D)/usr/share/dpkg/cputable
 endif
 endif
 
 
 define dpkg-installmanl10n
 define dpkg-installmanl10n