From 8867f71e1f76b6b8daa5a7545bddc2a35e3dcfd3 Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Thu, 17 Jan 2013 02:23:39 +0100 Subject: [PATCH] Debian package: Use variable for common path in debian/rules --- debian/rules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/rules b/debian/rules index a649b6d..7e1eea6 100755 --- a/debian/rules +++ b/debian/rules @@ -8,8 +8,8 @@ export DH_OPTIONS # Generating a xulrunner build id and other strings DEBIAN_VERSION := $(shell echo -n `head -1 debian/changelog | sed -e 's/^.*(\(.*\)).*$$/\\1/'`) - BUILDID := $(shell echo -n `whoami`@`hostname`)_$(shell date +%s) +USC = $(CURDIR)/debian/conkeror/usr/share/conkeror DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk @@ -45,11 +45,11 @@ install-indep: # Add generated Build ID and Debian version to version output sed -e 's/BuildID=git/BuildID=${BUILDID}/;s/^Version=\(.*\)$$/Version=\1 (Debian-${DEBIAN_VERSION})/' \ - -i $(CURDIR)/debian/conkeror/usr/share/conkeror/application.ini + -i $(USC)/application.ini # Use Debian version for M-x version output sed -e 's/Version=\(.*\)/Version=\1 (Debian-${DEBIAN_VERSION})/' \ - -i $(CURDIR)/debian/conkeror/usr/share/conkeror/components/application.js + -i $(USC)/components/application.js install-arch: dh_testdir -- 2.11.4.GIT