diff -ur -x changelog -x '*~' ../debian/rules debian/rules --- ../debian/rules 2016-07-26 21:17:51.000000000 +0200 +++ debian/rules 2016-07-26 21:33:17.161764000 +0200 @@ -12,6 +12,7 @@ PACKAGE = xdm include debian/xsfbs/xsfbs.mk +include /usr/share/dpkg/vendor.mk confflags += \ --prefix=/usr \ @@ -22,13 +23,19 @@ --with-xdmscriptdir=\$${xdmconfigdir} \ --with-authdir=/var/lib/xdm \ --with-pixmapdir=/usr/share/X11/xdm/pixmaps \ - --with-color-pixmap=ubuntu.xpm \ - --with-bw-pixmap=ubuntu.xpm \ --disable-xdm-auth \ --with-xft \ --disable-silent-rules \ $(NULL) +ifeq ($(DEB_VENDOR), Debian) + confflags += --with-color-pixmap=debian.xpm --with-bw-pixmap=debianbw.xpm +else ifeq ($(DEB_VENDOR), Ubuntu) + confflags += --with-color-pixmap=ubuntu.xpm --with-bw-pixmap=ubuntu.xpm +else + confflags += --with-color-pixmap=xorg.xpm --with-bw-pixmap=xorg.xpm +endif + configure_vars = $(shell DEB_BUILD_MAINT_OPTIONS="hardening=+pie,+bindnow" DEB_CFLAGS_MAINT_APPEND="-Wall" dpkg-buildflags --export=configure) ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))