646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
29 lines
823 B
Diff
29 lines
823 B
Diff
diff --git a/Makefile.am b/Makefile.am
|
|
index 0e69cd4..b4a1f1a 100644
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -26,7 +26,7 @@ dist_pkgconfig_DATA=libuldaq.pc
|
|
# fpga/USB_DIO32HS.bin
|
|
|
|
if OS_LINUX
|
|
-rulesdatadir=/lib/udev/rules.d/
|
|
+rulesdatadir=$(libdir)/udev/rules.d/
|
|
dist_rulesdata_DATA=rules/50-uldaq.rules
|
|
endif
|
|
|
|
@@ -42,14 +42,6 @@ dist-up: dist
|
|
mkdir -p $(reldir)
|
|
cp $(distdir).tar.bz2 $(reldir)
|
|
|
|
-if OS_LINUX
|
|
-install-data-hook:
|
|
- udevadm control --reload-rules && \
|
|
- test -f "/etc/redhat-release" && echo "/usr/local/lib" > /etc/ld.so.conf.d/uldaq.conf || echo "" && \
|
|
- test -f "/etc/arch-release" && echo "/usr/local/lib" > /etc/ld.so.conf.d/uldaq.conf || echo "" && \
|
|
- ldconfig
|
|
-endif
|
|
-
|
|
if OS_LINUX
|
|
uninstall-hook:
|
|
test -f "/etc/ld.so.conf.d/uldaq.conf" && rm "/etc/ld.so.conf.d/uldaq.conf" || echo ""
|