From c770145ed44b10bc4b4d4deba8017495ead52802 Mon Sep 17 00:00:00 2001 From: paulc Date: Fri, 10 Dec 2010 09:36:40 +0000 Subject: [PATCH] Fixed make install and uninstall targets for the new libyateqt4.so and qt4client.h git-svn-id: http://yate.null.ro/svn/yate/trunk@3940 acf43c95-373e-0410-b603-e72c3f656dc1 --- Makefile.in | 3 ++- clients/qt4/Makefile.in | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index 2b67d163..e1d13b84 100644 --- a/Makefile.in +++ b/Makefile.in @@ -206,13 +206,14 @@ install-noapi: all else \ install $$i "$(DESTDIR)$(libdir)/" ; \ fi \ - done && $(LDCONFIG) + done @mkdir -p "$(DESTDIR)$(bindir)/" && \ install $(PROGS) yate-config "$(DESTDIR)$(bindir)/" $(MAKE) -C ./modules install $(MAKE) -C ./clients install $(MAKE) -C ./share install $(MAKE) -C ./conf.d install + @$(LDCONFIG) @mkdir -p "$(DESTDIR)$(mandir)/man8/" && \ for i in $(MAN8) ; do \ install -m 0644 @srcdir@/docs/man/$$i "$(DESTDIR)$(mandir)/man8/" ; \ diff --git a/clients/qt4/Makefile.in b/clients/qt4/Makefile.in index 9a306575..baa80c43 100644 --- a/clients/qt4/Makefile.in +++ b/clients/qt4/Makefile.in @@ -39,6 +39,11 @@ endif prefix = @prefix@ exec_prefix = @exec_prefix@ +datarootdir = @datarootdir@ + +bindir = @bindir@ +libdir = @libdir@ +incdir = @includedir@/yate # include optional local make rules -include YateLocal.mak @@ -63,6 +68,26 @@ strip: all clean: @-$(RM) $(PROGS) $(LIBS) $(LIBD) $(OBJS) core 2>/dev/null +.PHONY: install uninstall +install: all + @mkdir -p "$(DESTDIR)$(libdir)" && \ + for i in $(LIBD_VER) $(LIBD_DEV) ; do \ + if [ -h "../../$$i" ]; then \ + f=`readlink "../../$$i"` ; \ + ln -sf "$$f" "$(DESTDIR)$(libdir)/$$i" ; \ + else \ + install ../../$$i "$(DESTDIR)$(libdir)/" ; \ + fi \ + done + @mkdir -p "$(DESTDIR)$(incdir)" && \ + install -m 0644 @srcdir@/qt4client.h "$(DESTDIR)$(incdir)/" + +uninstall: + @-for i in $(LIBD_VER) $(LIBD_DEV) ; do \ + rm "$(DESTDIR)$(libdir)/$$i" ; \ + done + @-rm "$(DESTDIR)$(incdir)/qt4client.h" && rmdir "$(DESTDIR)$(libdir)" + %.o: @srcdir@/%.cpp $(INCFILES) $(COMPILE) -c $<