From 3d346fdebc59fe69a34d25b8de5c2b574b614340 Mon Sep 17 00:00:00 2001 From: Aris Adamantiadis Date: Thu, 16 Nov 2006 20:58:01 +0000 Subject: fixed makefiles for debian packaging git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@83 7dcaeef0-15fb-0310-b436-a5af3365683c --- Makefile.in | 18 +++++++++--------- configure.in | 2 +- libssh/Makefile.in | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Makefile.in b/Makefile.in index 3501c4bb..cd286cbd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -22,7 +22,7 @@ LN = @LN_S@ LIBTOOL = @LIBTOOL@ OBJECTS = sample.o samplesshd.o APPS = samplessh samplesftp samplesshd -VERSION = 0.12-dev +VERSION = 0.2-dev DISTLIB = libssh-$(VERSION) CONFIG = include/libssh/config.h @@ -75,14 +75,14 @@ install: all (cd $$dir && $(MAKE) install) \ || case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \ done && test -z "$$fail" - $(top_srcdir)/mkinstalldirs $(incldir)/libssh - $(INSTALL) include/libssh/libssh.h $(incldir)/libssh/ - $(INSTALL) include/libssh/config.h $(incldir)/libssh/ - $(INSTALL) include/libssh/sftp.h $(incldir)/libssh/ - $(INSTALL) include/libssh/crypto.h $(incldir)/libssh/ - $(INSTALL) include/libssh/server.h $(incldir)/libssh/ - $(INSTALL) include/libssh/ssh2.h $(incldir)/libssh/ - $(INSTALL) include/libssh/ssh1.h $(incldir)/libssh/ + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(incldir)/libssh + $(INSTALL) include/libssh/libssh.h $(DESTDIR)$(incldir)/libssh/ + $(INSTALL) include/libssh/config.h $(DESTDIR)$(incldir)/libssh/ + $(INSTALL) include/libssh/sftp.h $(DESTDIR)$(incldir)/libssh/ + $(INSTALL) include/libssh/crypto.h $(DESTDIR)$(incldir)/libssh/ + $(INSTALL) include/libssh/server.h $(DESTDIR)$(incldir)/libssh/ + $(INSTALL) include/libssh/ssh2.h $(DESTDIR)$(incldir)/libssh/ + $(INSTALL) include/libssh/ssh1.h $(DESTDIR)$(incldir)/libssh/ .PHONY: clean clean: diff --git a/configure.in b/configure.in index 04a99f99..60bfc597 100644 --- a/configure.in +++ b/configure.in @@ -10,7 +10,7 @@ AC_CONFIG_HEADER([config.h]) # (Interfaces removed: CURRENT++, AGE=0, REVISION=0) # (Interfaces added: CURRENT++, AGE++, REVISION=0) # (No interfaces changed: REVISION++) -LIBSSH_CURRENT=1 +LIBSSH_CURRENT=2 LIBSSH_AGE=0 LIBSSH_REVISION=0 AC_SUBST(LIBSSH_CURRENT) diff --git a/libssh/Makefile.in b/libssh/Makefile.in index 28f919f0..f2b027cb 100644 --- a/libssh/Makefile.in +++ b/libssh/Makefile.in @@ -42,9 +42,9 @@ libssh.so: libssh.la libssh.a: libssh.la install: all - $(top_srcdir)/mkinstalldirs $(incldir) - $(top_srcdir)/mkinstalldirs $(libdir) - $(LIBTOOL) --mode=install $(INSTALL) libssh.la $(libdir) + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(incldir) + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir) + $(LIBTOOL) --mode=install $(INSTALL) libssh.la $(DESTDIR)$(libdir) clean: $(LIBTOOL) --mode=clean rm -f *~ libssh.la *.lo *.o distclean: clean -- cgit v1.2.3