summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2018-07-29 22:49:25 +0200
committerJörg Frings-Fürst <debian@jff.email>2018-07-29 22:49:25 +0200
commiteebdf9ccc5be2000041f000ea453d1389fc3c078 (patch)
tree9f09f2a5c6a11d7763520928e8096ae20cc90c4d
parent1e99d905950ff0d23522d57349f6da5b5a8b3927 (diff)
d/rules: Replace rm -f with
-rw-r--r--debian/changelog1
-rwxr-xr-xdebian/rules8
2 files changed, 5 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index eeedea7..7e08ace 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ openvpn (2.4.6-1) UNRELEASED; urgency=medium
- Remove trailing whitespaces.
- Replace outdated dh_installsystemd with dh_systemd_start.
- Remove usr/share/doc/openvpn/COPYING.
+ - Replace rm -f with $(RM).
* debian/watch:
- Use secure URI.
diff --git a/debian/rules b/debian/rules
index ffb411f..7bec9d2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,7 +52,7 @@ override_dh_auto_install:
install -m 755 debian/openvpn.if-up.d $(CURDIR)/debian/openvpn/etc/network/if-up.d/openvpn
install -m 755 debian/openvpn.if-down.d $(CURDIR)/debian/openvpn/etc/network/if-down.d/openvpn
# remove unwanted plugin files
- rm -f $(CURDIR)/debian/openvpn/usr/lib/$(DEB_HOST_GNU_TYPE)/openvpn/plugins/*.la
+ $(RM) $(CURDIR)/debian/openvpn/usr/lib/$(DEB_HOST_GNU_TYPE)/openvpn/plugins/*.la
# resolvconf script
install -m 755 debian/update-resolv-conf $(CURDIR)/debian/openvpn/etc/openvpn/update-resolv-conf
# bash completion
@@ -66,10 +66,10 @@ endif
override_dh_installexamples:
dh_installexamples
## remove windoze stuff
- rm -rf $(CURDIR)/debian/openvpn/usr/share/doc/openvpn/examples/easy-rsa/Windows
- rm -rf $(CURDIR)/debian/openvpn/usr/share/doc/openvpn/sample
+ $(RM) -r $(CURDIR)/debian/openvpn/usr/share/doc/openvpn/examples/easy-rsa/Windows
+ $(RM) -r $(CURDIR)/debian/openvpn/usr/share/doc/openvpn/sample
# remove gitignore file from samples
- rm -f $(CURDIR)/debian/openvpn/usr/share/doc/openvpn/examples/sample-keys/.gitignore
+ $(RM) $(CURDIR)/debian/openvpn/usr/share/doc/openvpn/examples/sample-keys/.gitignore
override_dh_installinit:
dh_installinit --no-start -- defaults 16 80