Fixed merge error.

src/Makefile

@@ -80,14 +80,7 @@ else
   INSTALL_DATA	= install -m 644
 endif
 INSTALL_DIR	= install -m 755 -d
-
-ROOT         ?=
-base_bindir  ?= /bin
-base_sbindir ?= /sbin
-bindir       ?= /usr/bin
-sysconfdir   ?= /etc
-includedir   ?= /usr/include
-mandir       ?= /usr/share/man
+MANDIR		= /usr/share/man
 
 ifeq ($(WITH_SELINUX),yes)
   SELINUX_DEF	=  -DWITH_SELINUX
@@ -203,47 +196,20 @@ clobber:	cleanobjs
 distclean:	clobber
 
 install:	all
-		$(INSTALL_DIR) $(ROOT)$(base_bindir)/ $(ROOT)$(base_sbindir)/
-		$(INSTALL_DIR) $(ROOT)$(bindir)/
+		$(INSTALL_DIR) $(ROOT)/bin/ $(ROOT)/sbin/
+		$(INSTALL_DIR) $(ROOT)/usr/bin/
 		for i in $(BIN); do \
-			$(INSTALL_EXEC) $$i $(ROOT)$(base_bindir)/ ; \
+			$(INSTALL_EXEC) $$i $(ROOT)/bin/ ; \
 		done
 		for i in $(SBIN); do \
-			$(INSTALL_EXEC) $$i $(ROOT)$(base_sbindir)/ ; \
+			$(INSTALL_EXEC) $$i $(ROOT)/sbin/ ; \
 		done
 		for i in $(USRBIN); do \
-			$(INSTALL_EXEC) $$i $(ROOT)$(bindir)/ ; \
+			$(INSTALL_EXEC) $$i $(ROOT)/usr/bin/ ; \
 		done
 		# $(INSTALL_DIR) $(ROOT)/etc/
 		$(INSTALL_DIR) $(ROOT)/etc/inittab.d
 		# $(INSTALL_EXEC) ../doc/initscript.sample $(ROOT)/etc/
-<<<<<<< HEAD
-		ln -sf halt $(ROOT)$(base_sbindir)/reboot
-		ln -sf halt $(ROOT)$(base_sbindir)/poweroff
-		ln -sf init $(ROOT)$(base_sbindir)/telinit
-		ln -sf $(base_sbindir)/killall5 $(ROOT)$(base_bindir)/pidof
-		if [ ! -f $(ROOT)$(bindir)/lastb ]; then \
-			ln -sf last $(ROOT)$(bindir)/lastb; \
-		fi
-		$(INSTALL_DIR) $(ROOT)$(includedir)/
-		$(INSTALL_DATA) initreq.h $(ROOT)$(includedir)/
-		for lang in  '' $(patsubst ../man/po/%.po,%,$(wildcard ../man/po/??.po)); do \
-			$(INSTALL_DIR) $(ROOT)$(mandir)/man1/$$lang; \
-			$(INSTALL_DIR) $(ROOT)$(mandir)/man5/$$lang; \
-			$(INSTALL_DIR) $(ROOT)$(mandir)/man8/$$lang; \
-		done
-		for man in $(MAN1) $(subst ../man/,,$(foreach man,$(MAN1),$(wildcard ../man/??/$(man)))); do \
-			$(INSTALL_DATA) ../man/$$man $(ROOT)$(mandir)/man1/$$man; \
-			sed -i "1{ $(MANDB); }" $(ROOT)$(mandir)/man1/$$man ; \
-		done
-		for man in $(MAN5) $(subst ../man/,,$(foreach man,$(MAN5),$(wildcard ../man/??/$(man)))); do \
-			$(INSTALL_DATA) ../man/$$man $(ROOT)$(mandir)/man5/$$man; \
-			sed -i "1{ $(MANDB); }" $(ROOT)$(mandir)/man5/$$man ; \
-		done
-		for man in $(MAN8) $(subst ../man/,,$(foreach man,$(MAN8),$(wildcard ../man/??/$(man)))); do \
-			$(INSTALL_DATA) ../man/$$man $(ROOT)$(mandir)/man8/$$man; \
-			sed -i "1{ $(MANDB); }" $(ROOT)$(mandir)/man8/$$man ; \
-=======
 		ln -sf halt $(ROOT)/sbin/reboot
 		ln -sf halt $(ROOT)/sbin/poweroff
 		ln -sf init $(ROOT)/sbin/telinit
@@ -258,7 +224,6 @@ install:	all
 		    $(INSTALL_DIR) $$targetdir; \
 		    $(INSTALL_DATA) ../man/$$man $$targetdir/$$(basename $$man); \
 		    sed -i "1{ $(MANDB); }" $$targetdir/$$(basename $$man); \
->>>>>>> 3.06
 		done
 ifeq ($(ROOT),)
 		#