diff options
| author | Andrej Shadura <andrewsh@debian.org> | 2018-12-28 13:58:39 +0100 |
|---|---|---|
| committer | Andrej Shadura <andrewsh@debian.org> | 2018-12-28 13:58:39 +0100 |
| commit | f97eb8990990b7938aecad3f06883f682750a125 (patch) | |
| tree | 0f863779dec83e3ef9f2c50eebb14fce3cb9b12c /pktsetup | |
| parent | 05fce0a970fe98a114b56719b046d783c7c28062 (diff) | |
Import Upstream version 2.1
Diffstat (limited to 'pktsetup')
| -rw-r--r-- | pktsetup/Makefile.am | 6 | ||||
| -rw-r--r-- | pktsetup/Makefile.in | 12 | ||||
| -rw-r--r-- | pktsetup/pktsetup.c | 1 |
3 files changed, 12 insertions, 7 deletions
diff --git a/pktsetup/Makefile.am b/pktsetup/Makefile.am index 344dbfe..0c5fd1c 100644 --- a/pktsetup/Makefile.am +++ b/pktsetup/Makefile.am @@ -3,8 +3,8 @@ pktsetup_SOURCES = pktsetup.c EXTRA_DIST = pktsetup.rules install-data-local: - mkdir -p "$(DESTDIR)/lib/udev/rules.d" - $(INSTALL_DATA) "$(srcdir)/pktsetup.rules" "$(DESTDIR)/lib/udev/rules.d/80-pktsetup.rules" + mkdir -p "$(DESTDIR)$(UDEVDIR)/rules.d" + $(INSTALL_DATA) "$(srcdir)/pktsetup.rules" "$(DESTDIR)$(UDEVDIR)/rules.d/80-pktsetup.rules" uninstall-local: - rm -f "$(DESTDIR)/lib/udev/rules.d/80-pktsetup.rules" + rm -f "$(DESTDIR)$(UDEVDIR)/rules.d/80-pktsetup.rules" diff --git a/pktsetup/Makefile.in b/pktsetup/Makefile.in index a2fbf6d..cc0fdb7 100644 --- a/pktsetup/Makefile.in +++ b/pktsetup/Makefile.in @@ -227,11 +227,17 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UDEVDIR = @UDEVDIR@ +UDEV_CFLAGS = @UDEV_CFLAGS@ +UDEV_LIBS = @UDEV_LIBS@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -621,11 +627,11 @@ uninstall-am: uninstall-local uninstall-sbinPROGRAMS install-data-local: - mkdir -p "$(DESTDIR)/lib/udev/rules.d" - $(INSTALL_DATA) "$(srcdir)/pktsetup.rules" "$(DESTDIR)/lib/udev/rules.d/80-pktsetup.rules" + mkdir -p "$(DESTDIR)$(UDEVDIR)/rules.d" + $(INSTALL_DATA) "$(srcdir)/pktsetup.rules" "$(DESTDIR)$(UDEVDIR)/rules.d/80-pktsetup.rules" uninstall-local: - rm -f "$(DESTDIR)/lib/udev/rules.d/80-pktsetup.rules" + rm -f "$(DESTDIR)$(UDEVDIR)/rules.d/80-pktsetup.rules" # 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. diff --git a/pktsetup/pktsetup.c b/pktsetup/pktsetup.c index 8b3df51..81ed142 100644 --- a/pktsetup/pktsetup.c +++ b/pktsetup/pktsetup.c @@ -27,7 +27,6 @@ #include <sys/stat.h> #include <unistd.h> #include <getopt.h> -#include <bits/types.h> #include <sys/types.h> #include <string.h> #include <limits.h> |