2004-02-11 Alexander Larsson <alexl@redhat.com>

	* Makefile:
	* Makefile.in:
	* configure.ac:
	* install-sh:
	Convert to autoconf
	Patch from James Henstridge

5 files changed, 314 insertions, 26 deletions

diff --git a/ChangeLog b/ChangeLog
index 733e0b7..07f5697 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-02-11  Alexander Larsson  <alexl@redhat.com>
+
+	* Makefile:
+	* Makefile.in:
+	* configure.ac:
+	* install-sh:
+	Convert to autoconf
+	Patch from James Henstridge
+
 2004-02-10  Alexander Larsson  <alexl@redhat.com>
 
 	* COPYING: 
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 86e1fba..0000000
--- a/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-VERSION=0.3
-PREFIX=/usr/local
-DATADIR=$(PREFIX)/share
-DESTDIR=
-INSTALL=install
-
-FILES=index.theme  Makefile README ChangeLog COPYING
-
-install:
-	mkdir -p $(DESTDIR)$(DATADIR)/icons/hicolor
-	$(INSTALL) index.theme $(DESTDIR)$(DATADIR)/icons/hicolor
-	for dir in 16x16 22x22 32x32 36x36 48x48 64x64 72x72 96x96 128x128 192x192 scalable; do \
-	  for ctxt in actions apps devices filesystems mimetypes; do \
-	    mkdir -p $(DESTDIR)$(DATADIR)/icons/hicolor/$$dir/$$ctxt; \
-	  done \
-        done
-
-dist:
-	rm -rf hicolor-icon-theme-$(VERSION)
-	mkdir hicolor-icon-theme-$(VERSION)
-	cp $(FILES) hicolor-icon-theme-$(VERSION)
-	tar czvf hicolor-icon-theme-$(VERSION).tar.gz hicolor-icon-theme-$(VERSION)
-	rm -rf hicolor-icon-theme-$(VERSION)
-
-tag:
-	cvs tag DEFAULT_ICON_THEME_`echo $(VERSION)|sed "s/\./_/"`
diff --git a/Makefile.in b/Makefile.in
new file mode 100644
index 0000000..4c10008
--- /dev/null
+++ b/Makefile.in
@@ -0,0 +1,46 @@
+PACKAGE = @PACKAGE_TARNAME@
+VERSION = @PACKAGE_VERSION@
+prefix = @prefix@
+datadir = @datadir@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+
+distdir = $(PACKAGE)-$(VERSION)
+FILES = README Makefile.in configure.ac configure install-sh index.theme ChangeLog
+
+ICON_SIZES = 16x16 22x22 32x32 36x36 48x48 64x64 72x72 96x96 \
+  128x128 192x192 scalable
+ICON_CONTEXTS = actions apps devices filesystems mimetypes
+
+all:
+	@:
+
+install:
+	mkdir -p $(DESTDIR)$(datadir)/icons/hicolor
+	$(INSTALL_DATA) index.theme $(DESTDIR)$(datadir)/icons/hicolor
+	for dir in $(ICON_SIZES); do \
+	  for ctxt in $(ICON_CONTEXTS); do \
+	    mkdir -p $(DESTDIR)$(datadir)/icons/hicolor/$$dir/$$ctxt; \
+	  done \
+        done
+
+dist:
+	rm -rf $(distdir)
+	mkdir $(distdir)
+	cp $(FILES) $(distdir)
+	tar czvf $(distdir).tar.gz $(distdir)
+	rm -rf $(distdir)
+
+tag:
+	cvs tag DEFAULT_ICON_THEME_`echo $(VERSION)|sed "s/\./_/"`
+
+# cause rebuilds
+Makefile: Makefile.in config.status
+	./config.status Makefile
+configure: configure.ac
+	autoconf
+config.status: configure
+	./configure.status --recheck
+
+.PHONY: all install dist tag
+
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..3e0951f
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,8 @@
+AC_INIT([hicolor-icon-theme], [0.4])
+
+AC_PROG_INSTALL
+
+AC_CONFIG_FILES([Makefile])
+
+AC_OUTPUT
+
diff --git a/install-sh b/install-sh
new file mode 100755
index 0000000..e9de238
--- /dev/null
+++ b/install-sh
@@ -0,0 +1,251 @@
+#!/bin/sh
+#
+# install - install a program, script, or datafile
+# This comes from X11R5 (mit/util/scripts/install.sh).
+#
+# Copyright 1991 by the Massachusetts Institute of Technology
+#
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation, and that the name of M.I.T. not be used in advertising or
+# publicity pertaining to distribution of the software without specific,
+# written prior permission.  M.I.T. makes no representations about the
+# suitability of this software for any purpose.  It is provided "as is"
+# without express or implied warranty.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.  It can only install one file at a time, a restriction
+# shared with many OS's install programs.
+
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit="${DOITPROG-}"
+
+
+# put in absolute paths if you don't have them in your path; or use env. vars.
+
+mvprog="${MVPROG-mv}"
+cpprog="${CPPROG-cp}"
+chmodprog="${CHMODPROG-chmod}"
+chownprog="${CHOWNPROG-chown}"
+chgrpprog="${CHGRPPROG-chgrp}"
+stripprog="${STRIPPROG-strip}"
+rmprog="${RMPROG-rm}"
+mkdirprog="${MKDIRPROG-mkdir}"
+
+transformbasename=""
+transform_arg=""
+instcmd="$mvprog"
+chmodcmd="$chmodprog 0755"
+chowncmd=""
+chgrpcmd=""
+stripcmd=""
+rmcmd="$rmprog -f"
+mvcmd="$mvprog"
+src=""
+dst=""
+dir_arg=""
+
+while [ x"$1" != x ]; do
+    case $1 in
+	-c) instcmd="$cpprog"
+	    shift
+	    continue;;
+
+	-d) dir_arg=true
+	    shift
+	    continue;;
+
+	-m) chmodcmd="$chmodprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-o) chowncmd="$chownprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-g) chgrpcmd="$chgrpprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-s) stripcmd="$stripprog"
+	    shift
+	    continue;;
+
+	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
+	    shift
+	    continue;;
+
+	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+	    shift
+	    continue;;
+
+	*)  if [ x"$src" = x ]
+	    then
+		src=$1
+	    else
+		# this colon is to work around a 386BSD /bin/sh bug
+		:
+		dst=$1
+	    fi
+	    shift
+	    continue;;
+    esac
+done
+
+if [ x"$src" = x ]
+then
+	echo "install:	no input file specified"
+	exit 1
+else
+	true
+fi
+
+if [ x"$dir_arg" != x ]; then
+	dst=$src
+	src=""
+	
+	if [ -d $dst ]; then
+		instcmd=:
+		chmodcmd=""
+	else
+		instcmd=mkdir
+	fi
+else
+
+# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+# might cause directories to be created, which would be especially bad 
+# if $src (and thus $dsttmp) contains '*'.
+
+	if [ -f $src -o -d $src ]
+	then
+		true
+	else
+		echo "install:  $src does not exist"
+		exit 1
+	fi
+	
+	if [ x"$dst" = x ]
+	then
+		echo "install:	no destination specified"
+		exit 1
+	else
+		true
+	fi
+
+# If destination is a directory, append the input filename; if your system
+# does not like double slashes in filenames, you may need to add some logic
+
+	if [ -d $dst ]
+	then
+		dst="$dst"/`basename $src`
+	else
+		true
+	fi
+fi
+
+## this sed command emulates the dirname command
+dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+
+# Make sure that the destination directory exists.
+#  this part is taken from Noah Friedman's mkinstalldirs script
+
+# Skip lots of stat calls in the usual case.
+if [ ! -d "$dstdir" ]; then
+defaultIFS='	
+'
+IFS="${IFS-${defaultIFS}}"
+
+oIFS="${IFS}"
+# Some sh's can't handle IFS=/ for some reason.
+IFS='%'
+set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
+IFS="${oIFS}"
+
+pathcomp=''
+
+while [ $# -ne 0 ] ; do
+	pathcomp="${pathcomp}${1}"
+	shift
+
+	if [ ! -d "${pathcomp}" ] ;
+        then
+		$mkdirprog "${pathcomp}"
+	else
+		true
+	fi
+
+	pathcomp="${pathcomp}/"
+done
+fi
+
+if [ x"$dir_arg" != x ]
+then
+	$doit $instcmd $dst &&
+
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
+else
+
+# If we're going to rename the final executable, determine the name now.
+
+	if [ x"$transformarg" = x ] 
+	then
+		dstfile=`basename $dst`
+	else
+		dstfile=`basename $dst $transformbasename | 
+			sed $transformarg`$transformbasename
+	fi
+
+# don't allow the sed command to completely eliminate the filename
+
+	if [ x"$dstfile" = x ] 
+	then
+		dstfile=`basename $dst`
+	else
+		true
+	fi
+
+# Make a temp file name in the proper directory.
+
+	dsttmp=$dstdir/#inst.$$#
+
+# Move or copy the file name to the temp name
+
+	$doit $instcmd $src $dsttmp &&
+
+	trap "rm -f ${dsttmp}" 0 &&
+
+# and set any options; do chmod last to preserve setuid bits
+
+# If any of these fail, we abort the whole thing.  If we want to
+# ignore errors from any of these, just make sure not to ignore
+# errors from the above "$doit $instcmd $src $dsttmp" command.
+
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
+
+# Now rename the file to the real destination.
+
+	$doit $rmcmd -f $dstdir/$dstfile &&
+	$doit $mvcmd $dsttmp $dstdir/$dstfile 
+
+fi &&
+
+
+exit 0