[libcvd-members] libcvd Makefile.in

[Edward Rosten]

CVSROOT:        /cvsroot/libcvd
Module name:    libcvd
Changes by:     Edward Rosten <edrosten>        08/12/08 20:56:47

Modified files:
        .              : Makefile.in 

Log message:
        DESTDIR patch from  Albert Huang

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/Makefile.in?cvsroot=libcvd&r1=1.83&r2=1.84

Patches:
Index: Makefile.in
===================================================================
RCS file: /cvsroot/libcvd/libcvd/Makefile.in,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- Makefile.in 5 Dec 2008 12:39:20 -0000       1.83
+++ Makefile.in 8 Dec 2008 20:56:47 -0000       1.84
@@ -34,8 +34,6 @@
 INSTALL = @INSTALL@
 AR=ar
 
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
@@ -146,13 +144,13 @@
 
 $(soname): $(OBJS)
        rm -f $(sos)
-       $(LD) $(shared) -o $(soname2) $(OBJS) $(LDFLAGS) $(LOADLIBES)
+       $(LD) $(shared) -o $(soname2) $(OBJS) $(LDFLAGS) $(LOADLIBES) 
-Wl,-soname,address@hidden@
        ln -s $(soname2) $(soname1)
        ln -s $(soname1) $(soname)
 
 $(dsoname): $(DEBUG_OBJS)
        rm -f $(dsos)
-       $(LD) $(shared) -o $(dsoname2) $(DEBUG_OBJS) $(LDFLAGS) $(LOADLIBES)
+       $(LD) $(shared) -o $(dsoname2) $(DEBUG_OBJS) $(LDFLAGS) $(LOADLIBES) 
-Wl,-soname,address@hidden@
        ln -s $(dsoname2) $(dsoname1)
        ln -s $(dsoname1) $(dsoname)
 
@@ -204,33 +202,33 @@
 install: install-progs install-headers install-libs install-libs-debug
 
 install-progs:progs
-       mkdir -p $(bindir)
-       [ "$(PROGS)" = "" ] || cp $(PROGS) $(bindir)
+       mkdir -p $(DESTDIR)$(bindir)
+       [ "$(PROGS)" = "" ] || cp $(PROGS) $(DESTDIR)$(bindir)
 
 install-headers:
-       mkdir -p $(includedir)
-       cp -r cvd $(includedir)
+       mkdir -p $(DESTDIR)$(includedir)
+       cp -r cvd $(DESTDIR)$(includedir)
 
 install-libs-so:$(soname)
-       mkdir -p $(libdir)
-       cp $(soname2) $(libdir)
-       rm -f  $(libdir)/$(soname1) $(libdir)/$(soname)
-       ln -s  $(libdir)/$(soname2) $(libdir)/$(soname1)
-       ln -s  $(libdir)/$(soname1) $(libdir)/$(soname)
+       mkdir -p $(DESTDIR)$(libdir)
+       cp $(soname2) $(DESTDIR)$(libdir)
+       rm -f  $(libdir)/$(soname1) $(DESTDIR)$(libdir)/$(soname)
+       ln -s  $(libdir)/$(soname2) $(DESTDIR)$(libdir)/$(soname1)
+       ln -s  $(libdir)/$(soname1) $(DESTDIR)$(libdir)/$(soname)
 
 install-libs-a:libcvd.a
-       mkdir -p $(libdir)
-       cp libcvd.a $(libdir)
+       mkdir -p $(DESTDIR)$(libdir)
+       cp libcvd.a $(DESTDIR)$(libdir)
 
 install-libs:install-libs-so install-libs-a
 
 install-libs-debug:$(dsoname) libcvd_debug.a
-       mkdir -p $(libdir)
-       cp $(dsoname2) $(libdir)
-       rm -f  $(libdir)/$(dsoname1) $(libdir)/$(dsoname)
-       ln -s  $(libdir)/$(dsoname2) $(libdir)/$(dsoname1)
-       ln -s  $(libdir)/$(dsoname1) $(libdir)/$(dsoname)
-       cp libcvd_debug.a $(libdir)
+       mkdir -p $(DESTDIR)$(libdir)
+       cp $(dsoname2) $(DESTDIR)$(libdir)
+       rm -f  $(libdir)/$(dsoname1) $(DESTDIR)$(libdir)/$(dsoname)
+       ln -s  $(libdir)/$(dsoname2) $(DESTDIR)$(libdir)/$(dsoname1)
+       ln -s  $(libdir)/$(dsoname1) $(DESTDIR)$(libdir)/$(dsoname)
+       cp libcvd_debug.a $(DESTDIR)$(libdir)