diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
commit | 5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch) | |
tree | cd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /package/autossh | |
parent | 401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff) | |
parent | 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
BUGS
package/autoconf/Makefile
Diffstat (limited to 'package/autossh')
-rw-r--r-- | package/autossh/Config.in | 9 | ||||
-rw-r--r-- | package/autossh/Makefile | 6 | ||||
-rw-r--r-- | package/autossh/patches/patch-Makefile_in | 36 |
3 files changed, 37 insertions, 14 deletions
diff --git a/package/autossh/Config.in b/package/autossh/Config.in deleted file mode 100644 index 5f72059f0..000000000 --- a/package/autossh/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config ADK_PACKAGE_AUTOSSH - prompt "autossh........................... Auto handle ssh tunnels" - tristate - default n - help - autossh is a program to start a copy of ssh and monitor it, - restarting it as necessary should it die or stop passing traffic. - - http://www.harding.motd.ca/autossh/ diff --git a/package/autossh/Makefile b/package/autossh/Makefile index b5e184463..d1bb28b24 100644 --- a/package/autossh/Makefile +++ b/package/autossh/Makefile @@ -19,11 +19,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,AUTOSSH,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE:= gnu -CONFIGURE_ARGS+= ac_cv_lib_nsl_gethostbyname=no -BUILD_STYLE:= auto - -do-install: +post-install: $(INSTALL_DIR) $(IDIR_AUTOSSH)/usr/bin $(INSTALL_BIN) $(WRKBUILD)/autossh $(IDIR_AUTOSSH)/usr/bin/ diff --git a/package/autossh/patches/patch-Makefile_in b/package/autossh/patches/patch-Makefile_in new file mode 100644 index 000000000..098c3fee1 --- /dev/null +++ b/package/autossh/patches/patch-Makefile_in @@ -0,0 +1,36 @@ +--- autossh-1.4b.orig/Makefile.in 2008-04-11 22:47:46.000000000 +0200 ++++ autossh-1.4b/Makefile.in 2010-02-05 17:49:30.511836749 +0100 +@@ -45,18 +45,18 @@ distclean: allclean + - /bin/rm -f Makefile + + install: $(TARGET) +- mkdir -p -m 755 $(bindir) +- mkdir -p -m 755 $(prefix)/share/doc/autossh +- mkdir -p -m 755 $(datadir)/examples/autossh +- mkdir -p -m 755 $(mandir)/man1 +- cp $(TARGET) $(bindir) +- cp CHANGES README $(datadir)/doc/autossh +- cp autossh.host $(datadir)/examples/autossh +- cp rscreen $(datadir)/examples/autossh +- cp autossh.1 $(mandir)/man1 +- chmod 755 $(bindir)/$(TARGET) +- chmod 644 $(datadir)/doc/autossh/CHANGES +- chmod 644 $(datadir)/doc/autossh/README +- chmod 644 $(datadir)/examples/autossh/autossh.host +- chmod 644 $(datadir)/examples/autossh/rscreen +- chmod 644 $(mandir)/man1/autossh.1 ++ mkdir -p -m 755 $(DESTDIR)$(bindir) ++ mkdir -p -m 755 $(DESTDIR)$(prefix)/share/doc/autossh ++ mkdir -p -m 755 $(DESTDIR)$(datadir)/examples/autossh ++ mkdir -p -m 755 $(DESTDIR)$(mandir)/man1 ++ cp $(TARGET) $(DESTDIR)$(bindir) ++ cp CHANGES README $(DESTDIR)$(datadir)/doc/autossh ++ cp autossh.host $(DESTDIR)$(datadir)/examples/autossh ++ cp rscreen $(DESTDIR)$(datadir)/examples/autossh ++ cp autossh.1 $(DESTDIR)$(mandir)/man1 ++ chmod 755 $(DESTDIR)$(bindir)/$(TARGET) ++ chmod 644 $(DESTDIR)$(datadir)/doc/autossh/CHANGES ++ chmod 644 $(DESTDIR)$(datadir)/doc/autossh/README ++ chmod 644 $(DESTDIR)$(datadir)/examples/autossh/autossh.host ++ chmod 644 $(DESTDIR)$(datadir)/examples/autossh/rscreen ++ chmod 644 $(DESTDIR)$(mandir)/man1/autossh.1 |