b7441e8990
* Clean up the port to use the new OPTIONS framework [1] * Make sure to use the right Python executable for afpstats [2] PR: 213192 [2] Submitted by: bofh [1] Differential Revision: D7537 [1]
42 lines
1.7 KiB
Text
42 lines
1.7 KiB
Text
--- config/Makefile.in.orig 2016-09-12 09:54:34 UTC
|
|
+++ config/Makefile.in
|
|
@@ -825,8 +825,8 @@ install-data-local: install-config-files
|
|
|
|
uninstall-local:
|
|
@for f in $(CONFFILES) $(GENFILES); do \
|
|
- echo rm -f $(DESTDIR)$(pkgconfdir)/$$f; \
|
|
- rm -f $(DESTDIR)$(pkgconfdir)/$$f; \
|
|
+ echo rm -f $(DESTDIR)$(pkgconfdir)/$$f.dist; \
|
|
+ rm -f $(DESTDIR)$(pkgconfdir)/$$f.dist; \
|
|
done
|
|
rm -f $(DESTDIR)$(pkgconfdir)/dbus-session.conf
|
|
rm -f $(DESTDIR)$(localstatedir)/netatalk/README
|
|
@@ -836,21 +836,16 @@ uninstall-local:
|
|
install-config-files: $(CONFFILES) $(GENFILES)
|
|
$(mkinstalldirs) $(DESTDIR)$(pkgconfdir)
|
|
@for f in $(CONFFILES) ; do \
|
|
- if test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f $(DESTDIR)$(pkgconfdir)/$$f; then \
|
|
- echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)"; \
|
|
- $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgconfdir); \
|
|
- else \
|
|
- echo "not overwriting $$f"; \
|
|
- fi; \
|
|
+ echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)/$$f.dist"; \
|
|
+ $(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)/$$f.dist; \
|
|
done
|
|
@for f in $(GENFILES); do \
|
|
- if test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f $(DESTDIR)$(pkgconfdir)/$$f; then \
|
|
- echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)"; \
|
|
- $(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir); \
|
|
- else \
|
|
- echo "not overwriting $$f"; \
|
|
- fi; \
|
|
+ if [ $$f != "dbus-session.conf" ]; then \
|
|
+ echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)/$$f.dist"; \
|
|
+ $(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)/$$f.dist; \
|
|
+ fi; \
|
|
done
|
|
+ $(INSTALL_DATA) dbus-session.conf $(DESTDIR)$(pkgconfdir)/dbus-session.conf.netatalk
|
|
|
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|