$NetBSD: patch-ae,v 1.6 2013/05/26 00:43:23 schnoebe Exp $ # Conform to autoconf's standard variable usage, making it easier # to install on pkgsrc platforms # reported upstream as https://bugs.launchpad.net/hplip/+bug/726218 # still needs to handle the buildlink path for libusb-1.0 :( # schnoebe -- Fri May 24 14:55:57 CDT 2013 --- Makefile.am.orig 2013-06-21 06:57:55.000000000 +0000 +++ Makefile.am @@ -110,22 +110,22 @@ hp_mkuri_LDADD = -ldl libhpmud.la hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\" #hpmud rules data dir -rulessystemdir=/usr/lib/systemd/system +rulessystemdir=$(libdir)/systemd/system dist_rulessystem_DATA =data/rules/hplip-printer@.service # hpmud.rules -rulesdir = /etc/udev/rules.d +rulesdir = $(sysconfdir)/udev/rules.d if UDEV_SYSFS_RULES dist_rules_DATA = data/rules/56-hpmud_sysfs.rules else dist_rules_DATA = data/rules/56-hpmud.rules endif -halpredir = /usr/share/hal/fdi/preprobe/10osvendor +halpredir = $(datadir)/hal/fdi/preprobe/10osvendor dist_halpre_DATA = data/rules/20-hplip-devices.fdi # hplip.conf -hplip_confdir = /etc/hp +hplip_confdir = $(sysconfdir)/hp hplip_conf_DATA = hplip.conf #pstotiff filter @@ -133,12 +133,12 @@ pstotiffdir = $(cupsfilterdir) pstotiff_SCRIPTS = fax/filters/pstotiff # hplip.state -hplip_statedir = /var/lib/hp +hplip_statedir = $(localstatedir)/lib/hp dist_hplip_state_DATA = # Log Files -hplip_Logdir=/var/log/hp -hplip_tmpdir=/var/log/hp/tmp +hplip_Logdir= $(localstatedir)/log/hp +hplip_tmpdir= $(localstatedir)/log/hp/tmp if FULL_BUILD @@ -355,9 +355,9 @@ endif # PolicyKit if POLICYKIT_INSTALL -policykit_dbus_etcdir = /etc/dbus-1/system.d +policykit_dbus_etcdir = $(sysconfdir)/dbus-1/system.d dist_policykit_dbus_etc_DATA = data/policykit/com.hp.hplip.conf -policykit_dbus_sharedir = /usr/share/dbus-1/system-services +policykit_dbus_sharedir = $(datadir)/dbus-1/system-services dist_policykit_dbus_share_DATA = data/policykit/com.hp.hplip.service policykit_policydir = $(policykit_dir) dist_policykit_policy_DATA = data/policykit/com.hp.hplip.policy @@ -571,13 +571,13 @@ install-data-hook: if HPLIP_BUILD # If scanner build, add hpaio entry to sane dll.conf. if [ "$(scan_build)" = "yes" ]; then \ - $(mkinstalldirs) $(DESTDIR)/etc/sane.d; \ - if [ ! -f $(DESTDIR)/etc/sane.d/dll.conf ]; then \ - touch $(DESTDIR)/etc/sane.d/dll.conf; \ + $(mkinstalldirs) $(DESTDIR)$(sysconfidir)/sane.d; \ + if [ ! -f $(DESTDIR)$(sysconfidir)/sane.d/dll.conf ]; then \ + touch $(DESTDIR)$(sysconfidir)/sane.d/dll.conf; \ fi; \ - if ! grep ^hpaio $(DESTDIR)/etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \ - echo "Adding hpaio entry to /etc/sane.d/dll.conf." ; \ - echo hpaio >>$(DESTDIR)/etc/sane.d/dll.conf ; \ + if ! grep ^hpaio $(DESTDIR)$(sysconfidir)/sane.d/dll.conf >/dev/null 2>/dev/null ; then \ + echo "Adding hpaio entry to $(sysconfidir)/sane.d/dll.conf." ; \ + echo hpaio >>$(DESTDIR)$(sysconfidir)/sane.d/dll.conf ; \ fi \ fi if FULL_BUILD