summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lamb <lamby@debian.org>2019-07-23 14:03:32 -0300
committerChris Lamb <lamby@debian.org>2019-07-23 14:11:56 -0300
commitce017c28cc4705d24bfad981e8507a065f96bb11 (patch)
treea5ff27ada962c24f55b8bd6ed12086711870d8a1
parent0ee985b9aa20084d3e7c7db0def08644c28a05ac (diff)
Apply patch from Helmut Grohne to move away from the (deprecated) xmkmf. (Closes: #902648)
-rw-r--r--debian/control2
-rwxr-xr-xdebian/rules9
2 files changed, 6 insertions, 5 deletions
diff --git a/debian/control b/debian/control
index 8190b43..ceea1f5 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xtrlock
Maintainer: Matthew Vernon <matthew@debian.org>
Section: x11
Priority: optional
-Build-Depends: libx11-dev, x11proto-core-dev, xutils-dev
+Build-Depends: libx11-dev, x11proto-core-dev
Standards-Version: 4.4.0
Package: xtrlock
diff --git a/debian/rules b/debian/rules
index 91b1572..12c1c75 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,10 +2,12 @@
# debian/rules file for xtrlock-2.0
# Based upon the sample debian.rules file by Ian Jackson.
+include /usr/share/dpkg/architecture.mk
+-include /usr/share/dpkg/buildtools.mk
+
package=xtrlock
-arch=$(shell dpkg --print-architecture)
-STRIP=strip
+STRIP=$(DEB_HOST_GNU_TYPE)-strip
DPKG_EXPORT_BUILDFLAGS = 1
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
@@ -15,8 +17,7 @@ CFLAGS+=-DSHADOW_PWD
build:
$(checkdir)
- xmkmf
- $(MAKE) CFLAGS="$(CFLAGS)" CDEBUGFLAGS="" LOCAL_LDFLAGS="$(LDFLAGS)" xtrlock
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) xtrlock.c -o xtrlock -lcrypt -lX11
touch build
clean: