[prev in list] [next in list] [prev in thread] [next in thread] 

List:       licq-devel
Subject:    [Licq-devel] [PATCH] qt-gui: fix make install when using build directories.
From:       "Juan F. Codagnone" <juam () users ! sourceforge ! net>
Date:       2003-09-01 19:30:01
[Download RAW message or body]

[Attachment #2 (multipart/mixed)]


build directories:
  $ cd /tmp
  $ mkdir build
  $ /path/to/licqsrc/configure --enable-debug ...
  $ make install

-- 
Buenos Aires, Argentina                          22°C with winds at 29 km/h NW

["builddir.diff" (text/x-diff)]

Index: share/Makefile.am
===================================================================
--- share/Makefile.am	(revision 3442)
+++ share/Makefile.am	(working copy)
@@ -1,6 +1,7 @@
 top_srcdir = @top_srcdir@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
+srcdir = @srcdir@
 
 bindir = @bindir@
 sharedir = @datadir@/licq/
@@ -11,47 +12,52 @@
 	@if test "$(KDEDIR)" != ""; then \
 	   if test -w "$(KDEDIR)"; then \
 	     $(mkinstalldirs) $(DESTDIR)$(KDEDIR)/share/applnk/Internet; \
-	     $(INSTALL_DATA) licq.desktop $(DESTDIR)$(KDEDIR)/share/applnk/Internet; \
+	     $(INSTALL_DATA) $(srcdir)/licq.desktop \
+	                          $(DESTDIR)$(KDEDIR)/share/applnk/Internet; \
 	   else \
 	     $(mkinstalldirs) $(HOME)/.kde/share/applnk/Internet; \
-	     $(INSTALL_DATA) licq.desktop $(HOME)/.kde/share/applnk/Internet; \
+	     $(INSTALL_DATA) $(srcdir)/licq.desktop $(HOME)/.kde/share/applnk/Internet; \
 	   fi  \
 	fi
 	$(mkinstalldirs) $(DESTDIR)$(sharedir)
 	$(mkinstalldirs) $(DESTDIR)$(sharedir)/qt-gui/locale
-	@for j in qt-gui/skin.*; do \
-	  echo "Installing skin $$j"; \
-	  $(mkinstalldirs) $(DESTDIR)$(sharedir)/$$j; \
+	@for j in $(srcdir)/qt-gui/skin.*; do \
+	  jj="qt-gui/`basename $$j`" ; \
+	  echo "Installing $$jj"; \
+	  $(mkinstalldirs) $(DESTDIR)$(sharedir)/$$jj; \
 	  for i in $$j/*; do \
 			if test -f $$i; then \
-	      $(INSTALL_DATA) $$i $(DESTDIR)$(sharedir)/$$j; \
+	       $(INSTALL_DATA) $$i $(DESTDIR)$(sharedir)/$$jj; \
 	    fi \
 	  done; \
 	done
-	@for j in qt-gui/dock.*; do \
-	  echo "Installing dock theme $$j"; \
-	  $(mkinstalldirs) $(DESTDIR)$(sharedir)/$$j; \
+	@for j in $(srcdir)/qt-gui/dock.*; do \
+	  jj="qt-gui/`basename $$j`" ; \
+	  echo "Installing dock theme $$jj"; \
+	  $(mkinstalldirs) $(DESTDIR)$(sharedir)/$$jj; \
 	  for i in $$j/*; do \
 			if test -f $$i; then \
-	      $(INSTALL_DATA) $$i $(DESTDIR)$(sharedir)/$$j; \
+	      $(INSTALL_DATA) $$i $(DESTDIR)$(sharedir)/$$jj; \
 	    fi \
 	  done; \
 	done
-	@for j in qt-gui/icons.*; do \
-	  echo "Installing icons $$j"; \
-	  $(mkinstalldirs) $(DESTDIR)$(sharedir)/$$j; \
+	@for j in $(srcdir)/qt-gui/icons.*; do \
+	  jj="qt-gui/`basename $$j`" ; \
+	  echo "Installing icons $$jj"; \
+	  $(mkinstalldirs) $(DESTDIR)$(sharedir)/$$jj; \
 	  for i in $$j/*; do \
 			if test -f $$i; then \
-	      $(INSTALL_DATA) $$i $(DESTDIR)$(sharedir)/$$j; \
+	      $(INSTALL_DATA) $$i $(DESTDIR)$(sharedir)/$$jj; \
 			fi \
 	  done; \
         done
-	@for j in qt-gui/extended.icons.*; do \
-          echo "Installing extended icons $$j"; \
-          $(mkinstalldirs) $(DESTDIR)$(sharedir)/$$j; \
+	@for j in $(srcdir)/qt-gui/extended.icons.*; do \
+	  jj="qt-gui/`basename $$j`" ; \
+          echo "Installing extended icons $$jj"; \
+          $(mkinstalldirs) $(DESTDIR)$(sharedir)/$$jj; \
           for i in $$j/*; do \
             if test -f $$i; then \
-              $(INSTALL_DATA) $$i $(DESTDIR)$(sharedir)/$$j; \
+              $(INSTALL_DATA) $$i $(DESTDIR)$(sharedir)/$$jj; \
             fi \
           done; \
 	done

[Attachment #6 (application/pgp-signature)]
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Licq-devel mailing list
Licq-devel@licq.org
https://lists.sourceforge.net/lists/listinfo/licq-devel

[prev in list] [next in list] [prev in thread] [next in thread]