Skip to content

Commit 0013065

Browse files
authored
Merge pull request #3491 from dougnazar/misc_fix_building_with_readonly_nfs_mount
Fix building with a read-only nfs mounted source
2 parents 577db0f + 65d5aa7 commit 0013065

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

scripts/python/module/Makefile.am

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,14 @@ upload publish: @dotMAKE@
8181
continue; \
8282
fi; \
8383
if test -s "$${B}" ; then \
84-
cp -pf "$${B}" PyNUTClient/ || exit ; \
84+
cp -f "$${B}" PyNUTClient/ || exit ; \
8585
continue; \
8686
fi ; \
8787
sed -e "s,[@]PYTHON_DEFAULT[@],@PYTHON_DEFAULT@," < "$(srcdir)/$${B}.in" > "PyNUTClient/$${B}" || exit ; \
8888
if test -x "$(srcdir)/$${B}.in" ; then chmod +x "PyNUTClient/$${B}"; fi ; \
8989
done ; \
90-
cp -pf "$(srcdir)/README.adoc" README.txt || exit ; \
91-
cp -pf "$(top_srcdir)/LICENSE-GPL3" . || exit ; \
90+
cp -f "$(srcdir)/README.adoc" README.txt || exit ; \
91+
cp -f "$(top_srcdir)/LICENSE-GPL3" . || exit ; \
9292
echo "from . import PyNUT" > PyNUTClient/__init__.py || exit
9393
@touch '$@'
9494

tools/Makefile.am

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,20 +45,20 @@ GENERATED_USB_FILES = nut-scanner/nutscan-usb.h
4545
# after such fundamental changes the project should better run `autogen.sh`.
4646

4747
# Hotplug output file
48-
GENERATED_USB_OS_FILES = $(top_builddir)/scripts/hotplug/libhid.usermap
48+
GENERATED_USB_OS_FILES = $(abs_top_builddir)/scripts/hotplug/libhid.usermap
4949

5050
# udev output file
51-
GENERATED_USB_OS_FILES += $(top_builddir)/scripts/udev/nut-usbups.rules.in
51+
GENERATED_USB_OS_FILES += $(abs_top_builddir)/scripts/udev/nut-usbups.rules.in
5252

5353
# BSD devd output file
54-
GENERATED_USB_OS_FILES += $(top_builddir)/scripts/devd/nut-usb.conf.in
54+
GENERATED_USB_OS_FILES += $(abs_top_builddir)/scripts/devd/nut-usb.conf.in
5555

5656
# FreeBSD quirks output file
57-
GENERATED_USB_OS_FILES += $(top_builddir)/scripts/devd/nut-usb.quirks
57+
GENERATED_USB_OS_FILES += $(abs_top_builddir)/scripts/devd/nut-usb.quirks
5858

5959
# UPower output file
6060
# Note: unlike others above, this one is currently tracked in Git
61-
GENERATED_USB_OS_FILES += $(top_builddir)/scripts/upower/95-upower-hid.hwdb
61+
GENERATED_USB_OS_FILES += $(abs_top_builddir)/scripts/upower/95-upower-hid.hwdb
6262

6363
CLEANFILES = $(GENERATED_SNMP_FILES) $(GENERATED_USB_FILES)
6464
# We do not clean away these files, some are even tracked in Git:
@@ -106,7 +106,7 @@ $(GENERATED_USB_OS_FILES): $(GENERATED_USB_FILES)
106106
@$(MKDIR_P) "$(@D)"
107107
@if test ! -s '$@' ; then \
108108
if test x"$(top_srcdir)" != x"$(top_builddir)" ; then \
109-
RELNAME="`echo '$@' | sed 's,^$(top_builddir)/*,,'`" ; \
109+
RELNAME="`echo '$@' | sed 's,^$(abs_top_builddir)/*,,'`" ; \
110110
SRCNAME="$(top_srcdir)/$${RELNAME}" ; \
111111
if test -s "$${SRCNAME}" ; then \
112112
echo "WARNING: GENERATED_USB_OS_FILES: using '$${SRCNAME}' for '$@'" >&2 ; \

0 commit comments

Comments
 (0)