1 files changed, 25 insertions, 54 deletions
diff --git a/app/luit/Makefile.am b/app/luit/Makefile.am
index 6299f1678..806967068 100644
--- a/app/luit/Makefile.am
+++ b/app/luit/Makefile.am
@@ -19,69 +19,40 @@
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 #  PERFORMANCE OF THIS SOFTWARE.
 
+SUBDIRS=man
 bin_PROGRAMS = luit
 
-LOCALEALIASFILE = @LOCALEALIASFILE@
+AM_CFLAGS =		\
+	$(CWARNFLAGS)	\
+	$(LUIT_CFLAGS)	\
+	$(OS_CFLAGS)	\
+	-DLOCALE_ALIAS_FILE=\"$(LOCALEALIASFILE)\"
 
-AM_CFLAGS = $(LUIT_CFLAGS) -DLOCALE_ALIAS_FILE=\"$(LOCALEALIASFILE)\"
 luit_LDADD = $(LUIT_LIBS)
 
-luit_SOURCES =	\
-        charset.c \
-        charset.h \
-        iso2022.c \
-        iso2022.h \
-        locale.c \
-        luit.c \
-        luit.h \
-        other.c \
-        other.h \
-        parser.c \
-        parser.h \
-        sys.c \
+luit_SOURCES =		\
+        charset.c	\
+        charset.h	\
+        iso2022.c	\
+        iso2022.h	\
+        locale.c	\
+        luit.c		\
+        luit.h		\
+        other.c		\
+        other.h		\
+        parser.c	\
+        parser.h	\
+        sys.c		\
         sys.h
 
-appman_PRE = \
-        luit.man
+MAINTAINERCLEANFILES = ChangeLog INSTALL
 
+.PHONY: ChangeLog INSTALL
 
-appmandir = $(APP_MAN_DIR)
-
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-
-EXTRA_DIST = $(appman_PRE) ChangeLog
-CLEANFILES = $(appman_DATA)
-
-SED = sed
-
-MAINTAINERCLEANFILES = ChangeLog
-
-.PHONY: ChangeLog
+INSTALL:
+	$(INSTALL_CMD)
 
 ChangeLog:
-	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
-
-dist-hook: ChangeLog
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
-  XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
-	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-	-e 's|__xservername__|Xorg|g' \
-	-e 's|__xconfigfile__|xorg.conf|g' \
-	-e 's|__localealiasfile__|$(LOCALEALIASFILE)|g' \
-	-e 's|__projectroot__|$(prefix)|g' \
-	-e 's|__apploaddir__|$(appdefaultdir)|' \
-	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
-	-e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
-	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
-	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
-	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-
-SUFFIXES = .$(APP_MAN_SUFFIX) .man
+	$(CHANGELOG_CMD)
 
-.man.$(APP_MAN_SUFFIX):
-	sed $(MAN_SUBSTS) < $< > $@
+dist-hook: ChangeLog INSTALL