Autotool ipa-server - patch from William Jon McCann <mccann@jhu.edu>.

ipa-server/ipa-kpasswd/Makefile

@@ -1,23 +0,0 @@
-include ../Makefile.common
-
-LDFLAGS +=-lkrb5 -llber -lldap
-
-OBJS = $(patsubst %.c,%.o,$(wildcard *.c))
-
-all: $(OBJS)
-	$(CC) $(LDFLAGS) $(OBJS) -o ipa_kpasswd
-
-%.o: %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-install:
-	echo $(SBINDIR)
-	-mkdir -p $(SBINDIR)
-	install -m 755 ipa_kpasswd $(SBINDIR)
-	-mkdir -p $(INITDIR)
-	install -m 755 ipa-kpasswd.init $(INITDIR)/ipa-kpasswd
-
-clean:
-	rm -f *.o
-	rm -f ipa_kpasswd
-	rm -f *~

ipa-server/ipa-kpasswd/Makefile.am

@@ -0,0 +1,50 @@
+NULL =
+
+INCLUDES =							\
+	-I.							\
+	-I$(srcdir)						\
+	-DPREFIX=\""$(prefix)"\" 				\
+	-DBINDIR=\""$(bindir)"\"				\
+	-DLIBDIR=\""$(libdir)"\" 				\
+	-DLIBEXECDIR=\""$(libexecdir)"\"			\
+	-DDATADIR=\""$(datadir)"\"				\
+	$(LDAP_CFLAGS)						\
+	$(KRB5_CFLAGS)						\
+	$(WARN_CFLAGS)						\
+	$(NULL)
+
+sbin_PROGRAMS =			\
+	ipa-kpasswd		\
+	$(NULL)
+
+ipa_kpasswd_SOURCES = 		\
+	ipa_kpasswd.c		\
+	$(NULL)
+
+ipa_kpasswd_LDADD =		\
+	$(LDAP_LIBS)		\
+	$(KRB5_LIBS)		\
+	$(NULL)
+
+EXTRA_DIST =			\
+	README			\
+	ipa-kpasswd.init	\
+	$(NULL)
+
+MAINTAINERCLEANFILES =		\
+	*~			\
+	Makefile.in
+
+initdir=$(sysconfdir)/rc.d/init.d
+
+install-data-hook: ipa-kpasswd.init
+
+	if test '!' -d $(DESTDIR)$(initdir); then \
+		$(mkinstalldirs) $(DESTDIR)$(initdir); \
+		chmod 755 $(DESTDIR)$(initdir); \
+	fi
+
+	$(INSTALL_SCRIPT) $(srcdir)/ipa-kpasswd.init $(DESTDIR)$(initdir)/ipa-kpasswd
+
+uninstall-hook:
+	rm -f $(DESTDIR)$(initdir)/ipa-kpasswd