You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

36 lines
1.9 KiB

  1. --- a/Makefile.linux
  2. +++ b/Makefile.linux
  3. @@ -96,13 +96,13 @@ endif # ($(TEST),1)
  4. endif # ($(TARGET_OPENWRT,)
  5. ifneq ($(shell ldd --version | grep GLIBC),)
  6. -GLIBC_VERSION := $(shell ldd --version | head -n 1 | sed 's/^.* //')
  7. -GLIBC_VERSION_MAJOR = $(shell echo $(GLIBC_VERSION) | cut -f 1 -d . )
  8. -GLIBC_VERSION_MINOR = $(shell echo $(GLIBC_VERSION) | cut -f 2 -d . )
  9. +#GLIBC_VERSION := $(shell ldd --version | head -n 1 | sed 's/^.* //')
  10. +#GLIBC_VERSION_MAJOR = $(shell echo $(GLIBC_VERSION) | cut -f 1 -d . )
  11. +#GLIBC_VERSION_MINOR = $(shell echo $(GLIBC_VERSION) | cut -f 2 -d . )
  12. # clock_gettime() needs -lrt when glibc version < 2.17
  13. -LDLIBS += $(shell if [ $(GLIBC_VERSION_MAJOR) -lt 2 ] \
  14. - || [ \( $(GLIBC_VERSION_MAJOR) -eq 2 \) -a \( $(GLIBC_VERSION_MINOR) -lt 17 \) ] ; \
  15. - then echo "-lrt" ; fi )
  16. +#LDLIBS += $(shell if [ $(GLIBC_VERSION_MAJOR) -lt 2 ] \
  17. +# || [ \( $(GLIBC_VERSION_MAJOR) -eq 2 \) -a \( $(GLIBC_VERSION_MINOR) -lt 17 \) ] ; \
  18. +# then echo "-lrt" ; fi )
  19. endif
  20. TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o
  21. @@ -143,11 +143,11 @@ install: miniupnpd $(SRCDIR)/miniupnpd.8
  22. $(INSTALL) $(SRCDIR)/netfilter/ip6tables_init.sh $(DESTDIR)$(ETCINSTALLDIR)
  23. $(INSTALL) $(SRCDIR)/netfilter/ip6tables_removeall.sh $(DESTDIR)$(ETCINSTALLDIR)
  24. $(INSTALL) $(SRCDIR)/netfilter/miniupnpd_functions.sh $(DESTDIR)$(ETCINSTALLDIR)
  25. - $(INSTALL) --mode=0644 -b $(SRCDIR)/miniupnpd.conf $(DESTDIR)$(ETCINSTALLDIR)
  26. + $(INSTALL) -m 0644 -b $(SRCDIR)/miniupnpd.conf $(DESTDIR)$(ETCINSTALLDIR)
  27. $(INSTALL) -d $(DESTDIR)$(PREFIX)/etc/init.d
  28. $(INSTALL) $(SRCDIR)/linux/miniupnpd.init.d.script $(DESTDIR)$(PREFIX)/etc/init.d/miniupnpd
  29. $(INSTALL) -d $(DESTDIR)$(MANINSTALLDIR)
  30. - $(INSTALL) --mode=0644 $(SRCDIR)/miniupnpd.8 $(DESTDIR)$(MANINSTALLDIR)
  31. + $(INSTALL) -m 0644 $(SRCDIR)/miniupnpd.8 $(DESTDIR)$(MANINSTALLDIR)
  32. gzip -f $(DESTDIR)$(MANINSTALLDIR)/miniupnpd.8
  33. # genuuid is using the uuidgen CLI tool which is part of libuuid