Make it possible to distribute finit.h in 'make dev-install'

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>

Makefile

@@ -34,7 +34,7 @@ ARCHTOOL    = `which git-archive-all`
 ARCHIVE     = $(PKG).tar
 ARCHIVEZ    = ../$(ARCHIVE).xz
 EXEC        = finit initctl reboot
-HEADERS     = plugin.h svc.h inetd.h helpers.h queue.h
+HEADERS     = finit.h plugin.h svc.h inetd.h helpers.h queue.h
 DISTFILES   = LICENSE README CHANGELOG finit.conf services
 OBJS        = finit.o api.o client.o conf.o exec.o helpers.o pid.o sig.o \
 	      svc.o service.o plugin.o tty.o inetd.o

client.c

@@ -22,6 +22,8 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"		/* Generated by configure script */
+
 #include <ctype.h>
 #include <getopt.h>
 #include <stdio.h>

conf.c

@@ -21,6 +21,8 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"		/* Generated by configure script */
+
 #include <ctype.h>
 #include <dirent.h>
 #include <string.h>

configure

@@ -27,6 +27,7 @@ defaults()
         confdir=${confdir:="finit.d"}
         rcsd=${rcsd:="$sysconfdir/$confdir"}
         console=${console:='_PATH_CONSOLE'}
+        shell=${shell:='_PATH_BSHELL'}
         defuser=${defuser:="root"}
         defhost=${defhost:="noname"}
         runlevel=${runlevel:=2}
@@ -56,6 +57,7 @@ result()
         echo "Config file       : $config"
         echo "rcs.d/ directory  : $rcsd"
         echo "Default console   : $console"
+#        echo "Fallback shell    : $shell"
         if [ x"$sysroot" != x"" ]; then
                 echo "Swap rootfs to    : $sysroot"
         fi
@@ -143,6 +145,7 @@ usage()
         echo "                         defaults to all plugins.  Exclude extension!"
         echo "  --with-rcsd=RCSD       Finit RCSD directory, default '\$sysconfdir/$confdir'"
         echo "  --with-console=DEV     Console to use, default: /dev/console"
+#        echo "  --with-shell=PATH      Fallback shell to use, default: /bin/sh"
         echo "  --with-sysroot=PATH    Some distributions keep a different (writable) rootfs"
         echo "                         that is used at runtime, usually /sysroot or /mnt"
         echo "  --with-username=USER   User for 'startx' .conf option, default: root"
@@ -228,6 +231,10 @@ while [ "$*" != "" ]; do
                         console="\"$arg\""
                         ;;
 
+                with-shell)
+                        shell="\"$arg\""
+                        ;;
+
                 with-sysroot)
                         sysroot="$arg"
                         ;;
@@ -380,6 +387,7 @@ echo "#define FINIT_FIFO      \"$fifo\""            >> config.h
 echo "#define FINIT_CONF      \"$config\""          >> config.h
 echo "#define FINIT_RCSD      \"$rcsd\""            >> config.h
 echo "#define CONSOLE         $console"             >> config.h
+echo "#define FALLBACK_SHELL  $shell"               >> config.h
 if [ x"$sysroot" != x"" ]; then
         echo "#define SYSROOT         \"$sysroot\"" >> config.h
 fi

exec.c

@@ -22,6 +22,8 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"		/* Generated by configure script */
+
 #include <ctype.h>		/* isdigit() */
 #include <dirent.h>
 #include <errno.h>

finit.c

@@ -22,6 +22,8 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"		/* Generated by configure script */
+
 #include <sys/mount.h>
 #include <ctype.h>
 #include <dirent.h>

finit.h

@@ -25,8 +25,6 @@
 #ifndef FINIT_H_
 #define FINIT_H_
 
-#include "config.h"		/* Generated by configure script */
-
 #include <errno.h>
 #include <fcntl.h>
 #include <paths.h>
@@ -36,12 +34,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-/* If the user configures us to not know about any getty use the system
- * defined /bin/sh (or similar) as fallback for TTYs. */
-#ifndef FALLBACK_SHELL
-# define FALLBACK_SHELL		_PATH_BSHELL
-#endif
-
 #define CMD_SIZE                256
 #define LINE_SIZE               1024
 #define BUF_SIZE                4096

plugins/initctl.c

@@ -22,6 +22,8 @@
  * THE SOFTWARE.
  */
 
+#include "../config.h"		/* Generated by configure script */
+
 #include <errno.h>
 #include <fcntl.h>		/* O_RDONLY et al */
 #include <signal.h>

service.c

@@ -22,6 +22,8 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"		/* Generated by configure script */
+
 #include <string.h>
 #include <sys/wait.h>
 #include <net/if.h>