Restructure liveinst/ for the new build system.

Added liveinst/Makefile.am and restructured the subdirectory to work a
little more easily with autoconf and automake.  The liveinst.console
file has been moved to console.apps/liveinst.  The liveinst.pam file has
been moved to pam.d/liveinst.  Additional Makefile.am files are present
in those subdirectories.

The restructure of liveinst/ is to account for the fact that most of the
files we have to install are named 'liveinst'.

8 files changed, 102 insertions, 136 deletions

diff --git a/liveinst/Makefile b/liveinst/Makefile
deleted file mode 100644
index 67d260efc..000000000
--- a/liveinst/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Makefile
-#
-# Copyright (C) 2007  Red Hat, Inc.  All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-all: liveinst.desktop
-
-liveinst.desktop: liveinst.desktop.in
-	LC_ALL=C intltool-merge -d -u ../po liveinst.desktop.in liveinst.desktop
-
-install:
-	mkdir -p $(DESTDIR)/usr/bin
-	mkdir -p $(DESTDIR)/usr/sbin
-	mkdir -p $(DESTDIR)/usr/share/applications
-	mkdir -p $(DESTDIR)/etc/pam.d $(DESTDIR)/etc/security/console.apps
-	mkdir -p $(DESTDIR)/etc/X11/xinit/xinitrc.d
-
-	install -m 0755 liveinst.sh $(DESTDIR)/usr/sbin/liveinst
-	ln -s consolehelper $(DESTDIR)/usr/bin/liveinst
-
-	install -m 0644 liveinst.pam $(DESTDIR)/etc/pam.d/liveinst
-	install -m 0644 liveinst.console $(DESTDIR)/etc/security/console.apps/liveinst
-
-	install -m 0644 liveinst.desktop $(DESTDIR)/usr/share/applications
-
-	install -m 0755 liveinst.xinit $(DESTDIR)/etc/X11/xinit/xinitrc.d/zz-liveinst.sh
-
-clean:
-	rm -f *~ liveinst.desktop
-
-depend:
-
diff --git a/liveinst/Makefile.am b/liveinst/Makefile.am
new file mode 100644
index 000000000..0193d473c
--- /dev/null
+++ b/liveinst/Makefile.am
@@ -0,0 +1,52 @@
+# liveinst/Makefile.am for anaconda
+#
+# Copyright (C) 2009  Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: David Cantrell <dcantrell@redhat.com>
+
+SUBDIRS = console.apps pam.d
+
+if IS_LIVEINST_ARCH
+dist_sbin_SCRIPTS  = liveinst
+
+desktopdir         = $(datadir)/applications
+desktop_DATA       = liveinst.desktop
+
+xinitdir           = /etc/X11/xinit/xinitrc.d
+dist_xinit_SCRIPTS = zz-liveinst.sh
+endif
+
+EXTRA_DIST = README liveinst.desktop.in
+
+CLEANFILES = liveinst.desktop
+
+MAINTAINERCLEANFILES = Makefile.in
+
+liveinst.desktop: liveinst.desktop.in
+	LC_ALL=C intltool-merge -d -u $(top_srcdir)/po liveinst.desktop.in liveinst.desktop
+
+install-exec-local:
+	mkdir -p $(DESTDIR)$(bindir)
+	ln -s consolehelper $(DESTDIR)$(bindir)/liveinst
+
+uninstall-local:
+	rm -f $(DESTDIR)$(bindir)/liveinst
+	for d in $(DESTDIR)$(bindir) ; do
+		while [ ! -z "$$d" ]; do \
+			rmdir $$d 2>/dev/null ; \
+			d="`dirname $$d`" ; \
+		done ; \
+	done
diff --git a/liveinst/console.apps/Makefile.am b/liveinst/console.apps/Makefile.am
new file mode 100644
index 000000000..e11506013
--- /dev/null
+++ b/liveinst/console.apps/Makefile.am
@@ -0,0 +1,25 @@
+# liveinst/console.apps/Makefile.am for anaconda
+#
+# Copyright (C) 2009  Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: David Cantrell <dcantrell@redhat.com>
+
+if IS_LIVEINST_ARCH
+consoledir        = /etc/security/console.apps
+dist_console_DATA = liveinst
+endif
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/liveinst/liveinst.console b/liveinst/console.apps/liveinst
index ef32d3063..ef32d3063 100644
--- a/liveinst/liveinst.console
+++ b/liveinst/console.apps/liveinst
diff --git a/liveinst/liveinst.sh b/liveinst/liveinst.sh
deleted file mode 100644
index 4f74d2e31..000000000
--- a/liveinst/liveinst.sh
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/sh
-#
-# Simple script to kick off an install from a live CD
-#
-# Copyright (C) 2007  Red Hat, Inc.  All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-if [ -z "$LIVE_BLOCK" ]; then
-    if [ -b "/dev/mapper/live-osimg-min" ]; then
-	LIVE_BLOCK="/dev/mapper/live-osimg-min"
-    else
-	LIVE_BLOCK="/dev/live-osimg"
-    fi
-fi
-
-if [ ! -b $LIVE_BLOCK ]; then
-  zenity --error --title="Not a Live image" --text "Can't do live image installation unless running from a live image"
-  exit 1
-fi
-
-# load modules that would get loaded by the loader... (#230945)
-for i in raid0 raid1 raid5 raid6 raid456 raid10 dm-mod dm-zero dm-mirror dm-snapshot dm-multipath dm-round-robin vfat dm-crypt cbc sha256 lrw xts ; do /sbin/modprobe $i 2>/dev/null ; done
-
-export ANACONDA_PRODUCTNAME=$( cat /etc/system-release | cut -d ' ' -f 1 )
-export ANACONDA_PRODUCTVERSION=$( cat /etc/system-release | sed -r -e 's/^.*([0-9]+) *\(.*$/\1/' )
-export ANACONDA_BUGURL=${ANACONDA_BUGURL:="https://bugzilla.redhat.com/bugzilla/"}
-export ANACONDAVERSION=$(rpm -q --qf "%{VERSION}-%{RELEASE}" anaconda)
-
-export PATH=/sbin:/usr/sbin:$PATH
-
-if [ -n "$DISPLAY" -a -n "$LANG" ]; then
-    INSTLANG="--lang $LANG"
-fi
-
-# eventually, we might want to allow a more "normal" install path
-ANACONDA="/usr/sbin/anaconda --liveinst --method=livecd://$LIVE_BLOCK $INSTLANG"
-
-if [ -x /usr/sbin/setenforce -a -e /selinux/enforce ]; then
-    current=$(cat /selinux/enforce)
-    /usr/sbin/setenforce 0
-fi
-
-if [ ! -e /selinux/load ]; then
-    ANACONDA="$ANACONDA --noselinux"
-fi
-
-# devkit-disks is now mounting lots of stuff.  for now, let's just try to unmount it all
-umount /media/*
-for mnt in $(cat /proc/mounts |grep ^/dev |grep -v live | awk {'print $2;'}) ; do umount $mnt 2>/dev/null ; done
-/sbin/swapoff -a
-/sbin/lvm vgchange -an --ignorelockingfailure
-
-if [ -x /usr/bin/devkit-disks ]; then
-    /usr/bin/devkit-disks --inhibit -- /usr/bin/hal-lock --interface org.freedesktop.Hal.Device.Storage --exclusive --run "$ANACONDA $*"
-elif [ -x /usr/bin/hal-lock -a -e /var/lock/subsys/haldaemon ]; then
-    /usr/bin/hal-lock --interface org.freedesktop.Hal.Device.Storage --exclusive --run "$ANACONDA $*"
-else
-    $ANACONDA $*
-fi
-
-if [ -n "$current" ]; then
-    /usr/sbin/setenforce $current
-fi
diff --git a/liveinst/liveinst.xinit b/liveinst/liveinst.xinit
deleted file mode 100755
index 41f636d16..000000000
--- a/liveinst/liveinst.xinit
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-# Set up a launcher on the desktop for the live installer if we're on
-# a live CD
-
-# don't run on geode (olpc)
-if [ `grep -c Geode /proc/cpuinfo` -eq 0 ]; then
-  if [ -b /dev/live-osimg ]; then
-    test -f ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs && source ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs
-    cp /usr/share/applications/liveinst.desktop "${XDG_DESKTOP_DIR:-$HOME/Desktop}"
-  elif [ -f /.livecd-configured ]; then  # FIXME: old way... this should go away
-    test -f ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs && source ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs
-    cp /usr/share/applications/liveinst.desktop "${XDG_DESKTOP_DIR:-$HOME/Desktop}"
-  fi
-fi
diff --git a/liveinst/pam.d/Makefile.am b/liveinst/pam.d/Makefile.am
new file mode 100644
index 000000000..9b2bf06c2
--- /dev/null
+++ b/liveinst/pam.d/Makefile.am
@@ -0,0 +1,25 @@
+# liveinst/pam.d/Makefile.am for anaconda
+#
+# Copyright (C) 2009  Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: David Cantrell <dcantrell@redhat.com>
+
+if IS_LIVEINST_ARCH
+pamdir        = /etc/pam.d
+dist_pam_DATA = liveinst
+endif
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/liveinst/liveinst.pam b/liveinst/pam.d/liveinst
index c7d67e332..c7d67e332 100644
--- a/liveinst/liveinst.pam
+++ b/liveinst/pam.d/liveinst