DESTDIR patch and another

Hi Eric,

please consider the following patches. I tested them against 0.96.

These first fixes some issue where files are installed to non-optimal directories.

Index: stklos-0.95/extensions/Makefile.am
===================================================================
--- stklos-0.95.orig/extensions/Makefile.am
+++ stklos-0.95/extensions/Makefile.am
@@ -11,7 +11,7 @@ CC	  = @CC@
 CFLAGS	  = @CFLAGS@ @SH_COMP_FLAGS@ @GTK_CONFIG_CFLAGS@ @GCINC@ $(INCLUDES)

-shobjectdir	    = $(prefix)/lib/ <at> PACKAGE@/@VERSION@
+shobjectdir	    = $(libdir)/@PACKAGE@/@VERSION@
 shobject_SCRIPTS    = ldap.@SH_SUFFIX@

 #======================================================================
@@ -20,7 +20,7 @@ shobject_SCRIPTS    = ldap.@SH_SUFFIX@
 scheme_SRCS = ldap.stk
 scheme_OBJS = ldap.ostk

-schemedir   = $(prefix)/share/ <at> PACKAGE@/@VERSION@
+schemedir   = $(datadir)/@PACKAGE@/@VERSION@
 scheme_DATA = $(scheme_SRCS) $(scheme_OBJS)

The next one fixes the DESTDIR issue I mentioned when 0.96 was just out. I
don't use the uninstall target, so that part is untested.

--- cinvoke/Makefile.templ.old  2007-11-28 18:54:49.000000000 +0100
+++ cinvoke/Makefile.templ      2007-11-28 18:54:49.000000000 +0100
@@ -11,15 +11,15 @@
         cp -f lib/arch/[ARCH_HEADER] lib/cinvoke-archspec.h

 install:
      install -d [PREFIX]/include
      install -d [PREFIX]/lib
+       install -d $(DESTDIR)[PREFIX]/include
+       install -d $(DESTDIR)[PREFIX]/lib
        install lib/cinvoke.h lib/cinvoke-arch.h lib/cinvoke-archspec.h \
              [PREFIX]/include
      install lib/libcinvoke.a [PREFIX]/lib
+               $(DESTDIR)[PREFIX]/include
+       install lib/libcinvoke.a $(DESTDIR)[PREFIX]/lib

 uninstall:
      rm -f [PREFIX]/include/cinvoke.h [PREFIX]/include/cinvoke-arch.h \
              [PREFIX]/include/cinvoke-archspec.h [PREFIX]/lib/libcinvoke.a
+       rm -f $(DESTDIR)[PREFIX]/include/cinvoke.h
$(DESTDIR)[PREFIX]/include/cinvoke-arch.h \
+               $(DESTDIR)[PREFIX]/include/cinvoke-archspec.h
$(DESTDIR)[PREFIX]/lib/libcinvoke.a

 clean:
        cd lib && $(MAKE) clean

Marijn

--
Marijn Schouten (hkBst), Gentoo Lisp project, Gentoo ML
<http://www.gentoo.org/proj/en/lisp/>, #gentoo-{lisp,ml} on FreeNode