diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-08-09 08:41:19 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-08-09 08:41:19 +0000 |
| commit | 9d829ed05c295df608b4fc108eb1c628fd06fd39 (patch) | |
| tree | c1b27cfe4498f8abef1a61325922906f3e6a32ff /packages/poptop/poptop-1.3.4/fix-plugins-install.patch | |
| parent | 1434b204e16e87b7f59f074f3036d5dcbcf0116f (diff) | |
| parent | 6ccac10beeaaa02a86081bd6179fd57c208ad6b1 (diff) | |
merge of '76e1e69496801009ea0aa69c84f76e858978ab99'
and 'db976a98427dd6a195e2cf167e225de2d0206aea'
Diffstat (limited to 'packages/poptop/poptop-1.3.4/fix-plugins-install.patch')
| -rw-r--r-- | packages/poptop/poptop-1.3.4/fix-plugins-install.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/packages/poptop/poptop-1.3.4/fix-plugins-install.patch b/packages/poptop/poptop-1.3.4/fix-plugins-install.patch new file mode 100644 index 0000000000..8a02f7a5de --- /dev/null +++ b/packages/poptop/poptop-1.3.4/fix-plugins-install.patch @@ -0,0 +1,26 @@ +Don't try and install as root. +Always set LIBDIR to the include the DESTDIR, otherwise it uses the +incorrect value set in the toplevel makefile. + +Index: pptpd-1.3.4/plugins/Makefile +=================================================================== +--- pptpd-1.3.4.orig/plugins/Makefile 2006-08-03 12:02:01.000000000 +1000 ++++ pptpd-1.3.4/plugins/Makefile 2007-06-09 11:42:57.000000000 +1000 +@@ -3,7 +3,7 @@ + CFLAGS = $(COPTS) -I.. -I../../include -fPIC + LDFLAGS = -shared + LDADD = -lutil +-INSTALL = install -o root ++INSTALL = install + prefix = /usr/local + + PLUGINS = pptpd-logwtmp.so +@@ -18,7 +18,7 @@ + %.so: %.c + $(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^ $(LDADD) + +-LIBDIR ?= $(DESTDIR)$(prefix)/lib/pptpd ++LIBDIR = $(DESTDIR)$(prefix)/lib/pptpd + + install: $(PLUGINS) + $(INSTALL) -d $(LIBDIR) |