Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Added $DESTDIR prefix in uninstall-local and install-exec-hook to fix…

… RPM builds
  • Loading branch information...
commit c5b229c5c87657197b0c814ff22127d870b55753 1 parent e8386db
@mrash authored
Showing with 21 additions and 22 deletions.
  1. +21 −22 Makefile.am
View
43 Makefile.am
@@ -13,7 +13,7 @@ SUBDIRS = \
common \
$(CLIENT_DIR) \
$(SERVER_DIR) \
- doc
+ doc
EXTRA_DIST = \
android/COPYING \
@@ -174,39 +174,38 @@ dist-hook:
rm -f $(distdir)/server/fwknopd.8
uninstall-local:
- if test -f $(sysconfdir)/fwknop/fwknopd.conf; then \
- rm -f $(sysconfdir)/fwknop/fwknopd.conf; \
+ if test -f $(DESTDIR)$(sysconfdir)/fwknop/fwknopd.conf; then \
+ rm -f $(DESTDIR)$(sysconfdir)/fwknop/fwknopd.conf; \
fi
- if test -f $(sysconfdir)/fwknop/fwknopd.conf.inst; then \
- rm -f $(sysconfdir)/fwknop/fwknopd.conf.inst; \
+ if test -f $(DESTDIR)$(sysconfdir)/fwknop/fwknopd.conf.inst; then \
+ rm -f $(DESTDIR)$(sysconfdir)/fwknop/fwknopd.conf.inst; \
fi
- if test -f $(sysconfdir)/fwknop/access.conf; then \
- rm -f $(sysconfdir)/fwknop/access.conf; \
+ if test -f $(DESTDIR)$(sysconfdir)/fwknop/access.conf; then \
+ rm -f $(DESTDIR)$(sysconfdir)/fwknop/access.conf; \
fi
- if test -f $(sysconfdir)/fwknop/access.conf.inst; then \
- rm -f $(sysconfdir)/fwknop/access.conf.inst; \
+ if test -f $(DESTDIR)$(sysconfdir)/fwknop/access.conf.inst; then \
+ rm -f $(DESTDIR)$(sysconfdir)/fwknop/access.conf.inst; \
fi
install-exec-hook:
- if test -d $(sysconfdir)/fwknop; then \
- chmod 700 $(sysconfdir)/fwknop; \
+ if test -d $(DESTDIR)$(sysconfdir)/fwknop; then \
+ chmod 700 $(DESTDIR)$(sysconfdir)/fwknop; \
fi
- if test -f $(sysconfdir)/fwknop/fwknopd.conf; then :; \
+ if test -f $(DESTDIR)$(sysconfdir)/fwknop/fwknopd.conf; then :; \
else \
- if test -f $(sysconfdir)/fwknop/fwknopd.conf.inst; then \
- mv $(sysconfdir)/fwknop/fwknopd.conf.inst $(sysconfdir)/fwknop/fwknopd.conf; \
+ if test -f $(DESTDIR)$(sysconfdir)/fwknop/fwknopd.conf.inst; then \
+ mv $(DESTDIR)$(sysconfdir)/fwknop/fwknopd.conf.inst $(DESTDIR)$(sysconfdir)/fwknop/fwknopd.conf; \
fi \
fi
- if test -f $(sysconfdir)/fwknop/access.conf; then :; \
+ if test -f $(DESTDIR)$(sysconfdir)/fwknop/access.conf; then :; \
else \
- if test -f $(sysconfdir)/fwknop/access.conf.inst; then \
- mv $(sysconfdir)/fwknop/access.conf.inst $(sysconfdir)/fwknop/access.conf; \
+ if test -f $(DESTDIR)$(sysconfdir)/fwknop/access.conf.inst; then \
+ mv $(DESTDIR)$(sysconfdir)/fwknop/access.conf.inst $(DESTDIR)$(sysconfdir)/fwknop/access.conf; \
fi \
fi
- if test -f $(sysconfdir)/fwknop/fwknopd.conf; then \
- chmod 600 $(sysconfdir)/fwknop/fwknopd.conf; \
+ if test -f $(DESTDIR)$(sysconfdir)/fwknop/fwknopd.conf; then \
+ chmod 600 $(DESTDIR)$(sysconfdir)/fwknop/fwknopd.conf; \
fi
- if test -f $(sysconfdir)/fwknop/access.conf; then \
- chmod 600 $(sysconfdir)/fwknop/access.conf; \
+ if test -f $(DESTDIR)$(sysconfdir)/fwknop/access.conf; then \
+ chmod 600 $(DESTDIR)$(sysconfdir)/fwknop/access.conf; \
fi
-
Please sign in to comment.
Something went wrong with that request. Please try again.