[sawfish: 29/42] remove host_type from install-paths

[Christopher Bratusek <chrisb src gnome org>]

commit ae36ddd04ce2f0650490a5ad09fb9393ae98a9ac
Author: Christopher Roy Bratusek <nano tuxfamily org>
Date:   Wed Apr 13 21:23:44 2011 +0200

    remove host_type from install-paths

 Makedefs.in   |    1 -
 Makefile.in   |    4 ++--
 build-info    |   13 +++++--------
 configure.in  |    2 +-
 sawfish.pc.in |    1 -
 5 files changed, 8 insertions(+), 13 deletions(-)
---
diff --git a/Makedefs.in b/Makedefs.in
index 7aaeee9..1b162a4 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -39,7 +39,6 @@ sharedstatedir= sharedstatedir@
 sawfishdir= sawfishdir@
 lispdir= lispdir@
 localedir= localedir@
-host_type= host@
 sawfishexecdir= sawfishexecdir@
 GNOMEDIR= GNOMEDIR@
 KDEDIR= KDEDIR@
diff --git a/Makefile.in b/Makefile.in
index b415ef2..7b9df6e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -34,8 +34,8 @@ all : build.h DOC
 
 # this depends on config.status so it's rebuilt if configure is re-run
 build.h : build-info config.status
-	$(SHELL) $< $(host_type) $(version)$(subversion) \
-	  '$(sawfishdir)' '$(lispdir)' '$(sawfishexecdir)' '$(localedir)'
+	$(SHELL) $< $(version)$(subversion) '$(sawfishdir)' \
+		'$(lispdir)' '$(sawfishexecdir)' '$(localedir)'
 
 install : all installdirs
 	for dir in $(SUBDIRS); do \
diff --git a/build-info b/build-info
index aab8335..584ad0b 100644
--- a/build-info
+++ b/build-info
@@ -2,12 +2,11 @@
 # build-info -- Generate header file containing build details
 # $Id: build-info,v 1.5 2000/11/16 21:58:27 jsh Exp $
 
-host_type="$1"
-version="$2"
-sawfishdir="$3"
-lispdir="$4"
-sawfishexecdir="$5"
-localedir="$6"
+version="$1"
+sawfishdir="$2"
+lispdir="$3"
+sawfishexecdir="$4"
+localedir="$5"
 
 [ -n "$HOSTNAME" ] \
     || HOSTNAME=`hostname` \
@@ -37,8 +36,6 @@ cat >src/build.h <<EOF
 #define SAWFISH_EXECDIR "$sawfishexecdir"
 #define SAWFISH_LOCALEDIR "$localedir"
 
-#define HOST_TYPE "$host_type"
-
 #define BUILD_HOST "$sys_name"
 #define BUILD_USER "$user_name"
 
diff --git a/configure.in b/configure.in
index ceb5b86..55a0f07 100644
--- a/configure.in
+++ b/configure.in
@@ -43,7 +43,7 @@ SUBDIRS="src lisp scripts themes sounds man"
 sawfishdir='${datadir}/sawfish'
 lispdir='${sawfishdir}/${version}/lisp'
 localedir='${datadir}/locale'
-sawfishexecdir='${libdir}/sawfish/${version}/${host_type}'
+sawfishexecdir='${libdir}/sawfish/${version}'
 
 dnl Several checks
 AC_C_CONST
diff --git a/sawfish.pc.in b/sawfish.pc.in
index cd61a48..8151100 100644
--- a/sawfish.pc.in
+++ b/sawfish.pc.in
@@ -3,7 +3,6 @@ exec_prefix= exec_prefix@
 libdir= libdir@
 includedir= includedir@
 
-sawfishhosttype= host@
 imageloader= imageloader@
 
 Name: sawfish