On Wed, 15 Aug 2018 at 12:42, Tianon Gravi <tia...@debian.org> wrote: > I think the attached patch is likely going to be our simplest fix > unless anyone following along (to src:docker!) sees any issues with > it?
Idiot old me, forgot the attachment. ♥, - Tianon 4096R / B42F 6819 007F 00F8 8E36 4FD4 036A 9C25 BF35 7DD4
diff --git a/debian/rules b/debian/rules index d9f07be..82d395f 100755 --- a/debian/rules +++ b/debian/rules @@ -1,97 +1,8 @@ #!/usr/bin/make -f -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. -include /usr/share/quilt/quilt.make - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - - -CFLAGS=-g -Wall -export CFLAGS - -ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O2 -else - CFLAGS += -O0 -endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif - -configure: configure-stamp -configure-stamp: $(QUILT_STAMPFN) - dh_testdir - # Add here commands to configure the package. - - touch configure-stamp - - -build: build-stamp - -build-stamp: configure-stamp - dh_testdir - - # Add here commands to compile the package. - $(MAKE) PREFIX=/usr - #/usr/bin/docbook-to-man debian/docker.sgml > docker.1 - - touch build-stamp - -clean: unpatch - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - - # Add here commands to clean up after the build process. - [ ! -f Makefile ] || $(MAKE) clean - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the package into debian/docker. +override_dh_auto_install: + mkdir -p $(CURDIR)/debian/wmdocker/usr/bin $(MAKE) install PREFIX=$(CURDIR)/debian/wmdocker/usr - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot -# dh_installdebconf - dh_installdocs - dh_installexamples - dh_installmenu -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_installinit - dh_installcron - dh_installman - dh_installinfo -# dh_undocumented - dh_installchangelogs - dh_link - dh_strip - dh_compress - dh_fixperms -# dh_makeshlibs - dh_installdeb -# dh_perl - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +%: + dh $@
