Many files:

  Checked in e2fsprogs 1.04.

5 files changed, 51 insertions, 66 deletions

diff --git a/lib/ss/ChangeLog b/lib/ss/ChangeLog
index c1ea2c2d..79438202 100644
--- a/lib/ss/ChangeLog
+++ b/lib/ss/ChangeLog
@@ -1,3 +1,12 @@
+Thu May 16 11:12:30 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Release of E2fsprogs version 1.04
+
+Thu May 16 10:04:09 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in (INSTALL_HFILES): Install the correct header files
+		so that /usr/include/ss/ss.h is actually usable!
+
 Wed Mar 27 00:33:40 1996    <tytso@rsts-11.mit.edu>
 
 	* Release of E2fsprogs version 1.03
diff --git a/lib/ss/Makefile.in b/lib/ss/Makefile.in
index 4a49726d..9af2c2f9 100644
--- a/lib/ss/Makefile.in
+++ b/lib/ss/Makefile.in
@@ -89,7 +89,9 @@ MKCMDSFILES=	mk_cmds.c utils.c options.c ct.y cmd_tbl.lex.l
 MKCMDSCSRCS=	mk_cmds.c utils.c options.c ct.tab.c cmd_tbl.lex.c
 
 
-HFILES=	ss.h ss_internal.h copyright.h
+HFILES=	ss.h ss_internal.h copyright.h 
+
+INSTALL_HFILES=	ss.h ss_err.h copyright.h 
 
 # for 'tags' and dependencies
 
@@ -99,7 +101,7 @@ CFILES=	$(SRCS) $(MKCMDSCSRCS) test_ss.c
 
 FILES=	$(SRCS) $(MKCMDSFILES) $(HFILES) \
 	ss_err.et std_rqs.ct Makefile \
-	test_ss.c ss mit-sipb-copyright.h copyright.h
+	test_ss.c ss copyright.h
 
 all::	libss.a # libss_p.a lint
 
@@ -119,20 +121,22 @@ ct.tab.c ct.tab.h: ct.y
 #	$(LD) -r -s -o $@ $(OBJS)
 #	$(CHMOD) -x $@
 
-mk_cmds: mk_cmds.sh
-	$(CP) mk_cmds.sh $@ && $(CHMOD) +x mk_cmds
+mk_cmds: $(SUBSTITUTE) $(srcdir)/mk_cmds.sh.in
+	-$(CHMOD) +x $(SUBSTITUTE) 
+	$(SUBSTITUTE) $(srcdir)/mk_cmds.sh.in mk_cmds
+	$(CHMOD) +x mk_cmds
 
 installdirs::
 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(ulibdir) \
 		$(DESTDIR)$(includedir)/ss
 
-install:: libss.a $(HFILES) copyright.h installdirs
+install:: libss.a $(INSTALL_HFILES) copyright.h installdirs
 	$(INSTALL_DATA) libss.a $(DESTDIR)$(ulibdir)/libss.a
 	$(CHMOD) 644 $(DESTDIR)$(ulibdir)/libss.a
 	-$(RANLIB) $(DESTDIR)$(ulibdir)/libss.a
 	$(CHMOD) $(LIBMODE) $(DESTDIR)$(ulibdir)/libss.a
 	$(RM) -f $(includedir)/ss/*
-	for i in $(HFILES) copyright.h; do \
+	for i in $(INSTALL_HFILES) copyright.h; do \
 		$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/ss/$$i; \
 	done
 
@@ -141,68 +145,40 @@ uninstall::
 	$(RM) -rf $(includedir)/ss
 
 clean::
-	$(RM) -f ../libss.a libss.a mk_cmds 
-	$(RM) -f *.o *~ \#* *.bak core 
+	$(RM) -f ../libss.a libss.a mk_cmds ss_err.h ss_err.c std_rqs.c \
+		*.o *~ \#* *.bak core 
 
 mostlyclean:: clean
 distclean:: clean
-	$(RM) -f .depend ss_err.h ss_err.c mk_cmds.sh Makefile
+	$(RM) -f .depend Makefile
 
 # +++ Dependency line eater +++
 # 
 # Makefile dependencies follow.  This must be the last section in
 # the Makefile.in file
 #
-invocation.o: $(srcdir)/invocation.c $(srcdir)/ss_internal.h \
-  $(srcdir)/ss.h \
-  $(srcdir)/mit-sipb-copyright.h $(top_builddir)/lib/ss/ss_err.h \
-  $(srcdir)/copyright.h
-help.o: $(srcdir)/help.c \
-  $(srcdir)/ss_internal.h \
-  $(srcdir)/ss.h $(srcdir)/mit-sipb-copyright.h \
-  $(top_builddir)/lib/ss/ss_err.h $(srcdir)/copyright.h 
+invocation.o: $(srcdir)/invocation.c $(srcdir)/ss_internal.h $(srcdir)/ss.h \
+ $(srcdir)/copyright.h $(top_builddir)/lib/ss/ss_err.h
+help.o: $(srcdir)/help.c $(srcdir)/ss_internal.h $(srcdir)/ss.h \
+ $(srcdir)/copyright.h $(top_builddir)/lib/ss/ss_err.h
 execute_cmd.o: $(srcdir)/execute_cmd.c $(srcdir)/ss_internal.h \
-  $(srcdir)/ss.h \
-  $(srcdir)/mit-sipb-copyright.h $(top_builddir)/lib/ss/ss_err.h \
-  $(srcdir)/copyright.h
-listen.o: $(srcdir)/listen.c $(srcdir)/copyright.h \
-  $(srcdir)/ss_internal.h \
-  $(srcdir)/ss.h $(srcdir)/mit-sipb-copyright.h \
-  $(top_builddir)/lib/ss/ss_err.h
-parse.o: $(srcdir)/parse.c \
-  $(srcdir)/ss_internal.h \
-  $(srcdir)/ss.h \
-  $(srcdir)/mit-sipb-copyright.h $(top_builddir)/lib/ss/ss_err.h \
-  $(srcdir)/copyright.h
-error.o: $(srcdir)/error.c \
-  $(srcdir)/copyright.h \
-  $(srcdir)/../et/com_err.h \
-  $(srcdir)/ss_internal.h \
-  $(srcdir)/ss.h \
-  $(srcdir)/mit-sipb-copyright.h $(top_builddir)/lib/ss/ss_err.h
-prompt.o: $(srcdir)/prompt.c $(srcdir)/copyright.h \
-  $(srcdir)/ss_internal.h \
-  $(srcdir)/ss.h \
-  $(srcdir)/mit-sipb-copyright.h $(top_builddir)/lib/ss/ss_err.h
-request_tbl.o: $(srcdir)/request_tbl.c \
-  $(srcdir)/copyright.h $(srcdir)/ss_internal.h \
-  $(srcdir)/ss.h $(srcdir)/mit-sipb-copyright.h \
-  $(top_builddir)/lib/ss/ss_err.h
+ $(srcdir)/ss.h $(srcdir)/copyright.h $(top_builddir)/lib/ss/ss_err.h
+listen.o: $(srcdir)/listen.c $(srcdir)/copyright.h $(srcdir)/ss_internal.h \
+ $(srcdir)/ss.h $(top_builddir)/lib/ss/ss_err.h
+parse.o: $(srcdir)/parse.c $(srcdir)/ss_internal.h $(srcdir)/ss.h \
+ $(srcdir)/copyright.h $(top_builddir)/lib/ss/ss_err.h
+error.o: $(srcdir)/error.c $(srcdir)/copyright.h $(srcdir)/../et/com_err.h \
+ $(srcdir)/ss_internal.h $(srcdir)/ss.h $(top_builddir)/lib/ss/ss_err.h
+prompt.o: $(srcdir)/prompt.c $(srcdir)/copyright.h $(srcdir)/ss_internal.h \
+ $(srcdir)/ss.h $(top_builddir)/lib/ss/ss_err.h
+request_tbl.o: $(srcdir)/request_tbl.c $(srcdir)/copyright.h \
+ $(srcdir)/ss_internal.h $(srcdir)/ss.h $(top_builddir)/lib/ss/ss_err.h
 list_rqs.o: $(srcdir)/list_rqs.c $(srcdir)/copyright.h \
-  $(srcdir)/ss_internal.h \
-  $(srcdir)/ss.h $(srcdir)/mit-sipb-copyright.h \
-  $(top_builddir)/lib/ss/ss_err.h
-pager.o: $(srcdir)/pager.c \
-  $(srcdir)/ss_internal.h \
-  $(srcdir)/ss.h \
-  $(srcdir)/mit-sipb-copyright.h $(top_builddir)/lib/ss/ss_err.h \
-  $(srcdir)/copyright.h
-requests.o: $(srcdir)/requests.c $(srcdir)/mit-sipb-copyright.h \
-  $(srcdir)/ss_internal.h \
-  $(srcdir)/ss.h \
-  $(top_builddir)/lib/ss/ss_err.h
-data.o: $(srcdir)/data.c \
-  $(srcdir)/ss_internal.h \
-  $(srcdir)/ss.h \
-  $(srcdir)/mit-sipb-copyright.h $(top_builddir)/lib/ss/ss_err.h \
-  $(srcdir)/copyright.h
+ $(srcdir)/ss_internal.h $(srcdir)/ss.h $(top_builddir)/lib/ss/ss_err.h
+pager.o: $(srcdir)/pager.c $(srcdir)/ss_internal.h $(srcdir)/ss.h \
+ $(srcdir)/copyright.h $(top_builddir)/lib/ss/ss_err.h
+requests.o: $(srcdir)/requests.c $(srcdir)/copyright.h \
+ $(srcdir)/ss_internal.h $(srcdir)/ss.h $(top_builddir)/lib/ss/ss_err.h
+data.o: $(srcdir)/data.c $(srcdir)/ss_internal.h $(srcdir)/ss.h \
+ $(srcdir)/copyright.h $(top_builddir)/lib/ss/ss_err.h
+
diff --git a/lib/ss/requests.c b/lib/ss/requests.c
index 52053370..9da96079 100644
--- a/lib/ss/requests.c
+++ b/lib/ss/requests.c
@@ -3,10 +3,10 @@
  *
  * Copyright 1987, 1988, 1989 by MIT
  *
- * For copyright information, see mit-sipb-copyright.h.
+ * For copyright information, see copyright.h.
  */
 
-#include "mit-sipb-copyright.h"
+#include "copyright.h"
 #include <stdio.h>
 #include "ss_internal.h"
 
diff --git a/lib/ss/ss.h b/lib/ss/ss.h
index 29aa9dcb..f992bd98 100644
--- a/lib/ss/ss.h
+++ b/lib/ss/ss.h
@@ -1,13 +1,13 @@
 /*
  * Copyright 1987, 1988 by MIT Student Information Processing Board
  *
- * For copyright information, see mit-sipb-copyright.h.
+ * For copyright information, see copyright.h.
  */
 
 #ifndef _ss_h
 #define _ss_h __FILE__
 
-#include <ss/mit-sipb-copyright.h>
+#include <ss/copyright.h>
 #include <ss/ss_err.h>
 
 extern int errno;
diff --git a/lib/ss/test_ss.c b/lib/ss/test_ss.c
index 7ee5c65d..aa4c7f35 100644
--- a/lib/ss/test_ss.c
+++ b/lib/ss/test_ss.c
@@ -9,8 +9,8 @@
  * $Locker$
  *
  * $Log$
- * Revision 1.5  1997/04/26 14:35:55  tytso
- * Checkin of e2fsprogs 1.02.
+ * Revision 1.7  1997/04/29 14:34:41  tytso
+ * Checked in e2fsprogs 1.04.
  *
  * Revision 1.1  1993/06/03  12:31:25  tytso
  * Initial revision