0001-fix-installation.patch 1.7 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344
  1. Makefile.in: fix installation steps
  2. Not sure what the reason for that patch is, but originally added by Ulf
  3. Samuelsson <ulf.samuelsson@atmel.com>, when upgrading from 2.6.x to 3.0.2.
  4. yann.morin.1998@free.fr: the initial commit in the Buildroot tree had the
  5. SoB by Ulf, but it was not explicitly reproduced here in the patch; so I
  6. added it here directly in the patch.
  7. Somewhat-signed-off-by: Ulf Samuelsson <ulf.samuelsson@atmel.com>
  8. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
  9. diff -durN vtun-3.0.3.orig/Makefile.in vtun-3.0.3/Makefile.in
  10. --- vtun-3.0.3.orig/Makefile.in 2012-07-09 06:55:38.000000000 +0200
  11. +++ vtun-3.0.3/Makefile.in 2013-02-16 23:28:47.034036869 +0100
  12. @@ -28,7 +28,7 @@
  13. LEXFLAGS = -t
  14. INSTALL = @INSTALL@
  15. -INSTALL_OWNER = -o root -g 0
  16. +INSTALL_OWNER =
  17. prefix = @prefix@
  18. exec_prefix = @exec_prefix@
  19. @@ -89,16 +89,15 @@
  20. install_config:
  21. $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(ETC_DIR)
  22. - if [ ! -f $(ETC_DIR)/vtund.conf ]; then \
  23. - $(INSTALL) -m 600 $(INSTALL_OWNER) vtund.conf $(DESTDIR)$(ETC_DIR); \
  24. - fi
  25. + $(INSTALL) -m 600 $(INSTALL_OWNER) vtund.conf $(DESTDIR)$(ETC_DIR);
  26. + $(INSTALL) -m 600 $(INSTALL_OWNER) scripts/vtund-start.conf $(DESTDIR)$(ETC_DIR);
  27. install: vtund install_config install_man
  28. - $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(VAR_DIR)/run
  29. $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(STAT_DIR)
  30. $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(LOCK_DIR)
  31. $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(SBIN_DIR)
  32. $(INSTALL) -m 755 $(INSTALL_OWNER) vtund $(DESTDIR)$(SBIN_DIR)
  33. - $(BIN_DIR)/strip $(DESTDIR)$(SBIN_DIR)/vtund
  34. + $(INSTALL) -m 755 -D $(INSTALL_OWNER) scripts/vtund.rc.debian \
  35. + $(DESTDIR)$(ETC_DIR)/init.d/S90vtun
  36. # DO NOT DELETE THIS LINE -- make depend depends on it.