$OpenBSD: patch-lib_et_Makefile_in,v 1.4 2009/03/15 19:59:31 landry Exp $
--- lib/et/Makefile.in.orig	Tue Oct  7 16:22:39 2008
+++ lib/et/Makefile.in	Sun Feb 22 11:41:29 2009
@@ -22,18 +22,18 @@ SRCS = $(srcdir)/error_message.c $(srcdir)/et_name.c $
 HFILES= com_err.h
 SHARE_FILES= et_c.awk et_h.awk
 
-LIBRARY= libcom_err
+LIBRARY= libext2fs_com_err
 LIBDIR= et
 
-ELF_VERSION = 2.1
-ELF_SO_VERSION = 2
-ELF_IMAGE = libcom_err
+ELF_VERSION = $(LIBext2fs_com_err_VERSION)
+ELF_SO_VERSION = $(LIBext2fs_com_err_VERSION)
+ELF_IMAGE = libext2fs_com_err
 ELF_MYDIR = et
 ELF_INSTALL_DIR = $(root_libdir)
 ELF_OTHER_LIBS = @SEM_INIT_LIB@
 
 BSDLIB_VERSION = 1.1
-BSDLIB_IMAGE = libcom_err
+BSDLIB_IMAGE = libext2fs_com_err
 BSDLIB_MYDIR = et
 BSDLIB_INSTALL_DIR = $(root_libdir)
 
@@ -41,8 +41,7 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
 # what to build...
 #
 .c.o:
-	@echo "	CC $<"
-	@$(CC) $(ALL_CFLAGS) -c $< -o $@
+	$(CC) $(ALL_CFLAGS) -c $< -o $@
 @PROFILE_CMT@	@$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
 @CHECKER_CMT@	@$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
 @ELF_CMT@	@$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
@@ -55,16 +54,14 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
 @MAKEFILE_CHECKER@
 
 compile_et: $(DEP_SUBSTITUTE) $(srcdir)/compile_et.sh.in
-	@echo "	SUBST $@"
-	@$(SUBSTITUTE) $(srcdir)/compile_et.sh.in compile_et
-	@$(CHMOD) +x compile_et
+	$(SUBSTITUTE) $(srcdir)/compile_et.sh.in compile_et
+	$(CHMOD) +x compile_et
 
 com_err.ps : com_err.dvi
 com_err.dvi: com_err.texinfo
 
 com_err.pc: $(srcdir)/com_err.pc.in $(top_builddir)/config.status
-	@echo "	CONFIG.STATUS $@"
-	@cd $(top_builddir); CONFIG_FILES=lib/et/com_err.pc ./config.status
+	cd $(top_builddir); CONFIG_FILES=lib/et/com_err.pc ./config.status
 
 #libcom_err.o:	$(LIBOBJS)
 #	$(LD) -r -s -o libcom_err.o $(LIBOBJS)
@@ -74,37 +71,29 @@ TAGS:	$(SRCS)
 	$(TAGS) $(SRCS)
 
 installdirs::
-	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/et $(datadir)/et $(bindir) $(man1dir) $(man3dir)"
-	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
+	$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
 		$(DESTDIR)$(includedir)/et $(DESTDIR)$(datadir)/et \
 		$(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) \
 		$(DESTDIR)$(man3dir) $(DESTDIR)$(libdir)/pkgconfig
 
-install:: compile_et libcom_err.a $(HFILES) installdirs com_err.pc
-	@echo "	INSTALL_DATA $(libdir)/libcom_err.a"
-	@$(INSTALL_DATA) libcom_err.a $(DESTDIR)$(libdir)/libcom_err.a
-	@-$(RANLIB) $(DESTDIR)$(libdir)/libcom_err.a
-	@$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libcom_err.a
-	@for i in $(HFILES); do \
-		echo "	INSTALL_DATA $(includedir)/et/$$i"; \
+install:: compile_et $(LIBRARY).a $(HFILES) installdirs com_err.pc
+	$(INSTALL_DATA) $(LIBRARY).a $(DESTDIR)$(libdir)/$(LIBRARY).a
+	$(RANLIB) $(DESTDIR)$(libdir)/$(LIBRARY).a
+	$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/$(LIBRARY).a
+	for i in $(HFILES); do \
 		$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/et/$$i; \
 	done
-	@for i in $(SHARE_FILES); do \
-		echo "	INSTALL_DATA $(datadir)/et/$$i"; \
+	for i in $(SHARE_FILES); do \
 		$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(datadir)/et/$$i; \
 	done
-	@echo "	INSTALL_SCRIPT $(bindir)/compile_et"
-	@$(INSTALL_SCRIPT) compile_et $(DESTDIR)$(bindir)/compile_et
-	@echo "	INSTALL_DATA $(man3dir)/com_err.3"
-	@$(INSTALL_DATA) $(srcdir)/com_err.3 $(DESTDIR)$(man3dir)/com_err.3
-	@echo "	INSTALL_DATA $(man1dir)/compile_et.1"
-	@$(INSTALL_DATA) $(srcdir)/compile_et.1 \
+	$(INSTALL_SCRIPT) compile_et $(DESTDIR)$(bindir)/compile_et
+	$(INSTALL_DATA) $(srcdir)/com_err.3 $(DESTDIR)$(man3dir)/com_err.3
+	$(INSTALL_DATA) $(srcdir)/compile_et.1 \
 			$(DESTDIR)$(man1dir)/compile_et.1
-	@echo "	INSTALL_DATA $(libdir)/pkgconfig/com_err.pc"
-	@$(INSTALL_DATA) com_err.pc $(DESTDIR)$(libdir)/pkgconfig/com_err.pc
+	$(INSTALL_DATA) com_err.pc $(DESTDIR)$(libdir)/pkgconfig/com_err.pc
 
 uninstall::
-	$(RM) -f $(DESTDIR)$(libdir)/libcom_err.a \
+	$(RM) -f $(DESTDIR)$(libdir)/$(LIBRARY).a \
 		$(DESTDIR)$(bindir)/compile_et \
 		$(DESTDIR)$(libdir)/pkgconfig/com_err.pc
 	$(RM) -rf $(DESTDIR)$(includedir)/et $(DESTDIR)$(datadir)/et
@@ -122,10 +111,10 @@ check:: compile_et
 	done
 
 clean::
-	$(RM) -f compile_et libcom_err.a libcom_err_p.a com_err.info
+	$(RM) -f compile_et $(LIBRARY).a $(LIBRARY)_p.a com_err.info
 	$(RM) -f $(OBJS) profiled/*
 	$(RM) -f *~ \#* *.bak *.otl *.aux *.toc *.PS *.dvi *.ps TAGS *.ln
-	$(RM) -f ../libcom_err.a ../libcom_err_p.a
+	$(RM) -f ../$(LIBRARY).a ../$(LIBRARY)_p.a
 
 mostlyclean:: clean
 distclean:: clean