diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-06-24 13:35:44 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-06-24 13:35:44 +0200 |
| commit | c2f8d1a44defeadefcda560ba8a3883e25e24831 (patch) | |
| tree | 1eead2a9118b556932ca10e398d8d94f510b70ac /debian/rules | |
| parent | a88aa2e1a16e1ac1af1fa3b19cb2b88c7783af37 (diff) | |
| parent | 9324923d31d389110e2ab882a035982e2b269417 (diff) | |
| download | vyatta-op-vpn-lithium.tar.gz vyatta-op-vpn-lithium.zip | |
Merge branch 'current' into lithiumlithium
Conflicts:
lib/OPMode.pm
scripts/vyatta-show-ipsec-status.pl
templates/show/vpn/ipsec/sa/node.def
templates/show/vpn/ipsec/sa/peer/node.def
templates/show/vpn/ipsec/status/node.def
Diffstat (limited to 'debian/rules')
| -rwxr-xr-x | debian/rules | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/debian/rules b/debian/rules index 4b68fde..9231584 100755 --- a/debian/rules +++ b/debian/rules @@ -22,7 +22,6 @@ CFLAGS = -Wall -g configure = ./configure configure += --host=$(DEB_HOST_GNU_TYPE) configure += --build=$(DEB_BUILD_GNU_TYPE) -configure += --prefix=/opt/vyatta configure += --mandir=\$${prefix}/share/man configure += --infodir=\$${prefix}/share/info configure += CFLAGS="$(CFLAGS)" @@ -43,9 +42,10 @@ config.status: configure rm -f config.cache $(configure) -build: build-stamp - -build-stamp: config.status +build: build-arch build-indep +build-arch: build-stamp +build-indep: build-stamp +build-stamp: config.status dh_testdir $(MAKE) touch $@ @@ -68,13 +68,12 @@ clean-patched: install: build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs $(MAKE) DESTDIR=$(PKGDIR) install install -D --mode=0644 debian/lintian $(PKGDIR)/usr/share/lintian/overrides/$(PACKAGE) - install -D --mode=0644 debian/linda $(PKGDIR)/usr/share/linda/overrides/$(PACKAGE) # Build architecture-independent files here. binary-indep: build install |