Make sure we return the descriptor from the file handle. Noted by

[nmh] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a284150eda71554677b635b5ae8ff214f2bd1647..caffaabf13ee96132fea13402d22b2c9e6b90895 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -177,6 +177,7 @@ check_PROGRAMS = \
     test/getcanon \
     test/getcwidth \
     test/getfullname \
+    test/runpty \
     #
 
 ## So they can be built without builing the `check' target.
@@ -358,7 +359,19 @@ noinst_HEADERS = \
     h/utils.h \
     mts/smtp/smtp.h \
     sbr/ctype-checked.h \
+    sbr/lock_file.h \
+    sbr/m_maildir.h \
+    sbr/m_mktemp.h \
+    sbr/m_popen.h \
+    sbr/m_rand.h \
+    sbr/makedir.h \
+    sbr/message_id.h \
+    sbr/mime_type.h \
+    sbr/unquote.h \
     thirdparty/jsmn/jsmn.h \
+    uip/mhfree.h \
+    uip/mhoutsbr.h \
+    uip/mhshowsbr.h \
     #
 
 ##
@@ -844,6 +857,9 @@ test_fakehttp_LDADD = $(LDADD) $(POSTLINK)
 test_getcwidth_SOURCES = test/getcwidth.c
 test_getcwidth_LDADD = $(POSTLINK)
 
+test_runpty_SOURCES = test/runpty.c
+test_runpty_LDADD = $(POSTLINK)
+
 ##
 ## Our rebuild rules for files that aren't built via the normal mechanisms
 ##
@@ -855,7 +871,6 @@ config/version.c: Makefile $(srcdir)/config/version.sh
        env srcdir="$(srcdir)" sh $(srcdir)/config/version.sh $(VERSION) > ./config/version.c
 
 etc/bash_completion_nmh: $(srcdir)/etc/bash_completion_nmh-gen
-       $(MKDIR_P) $(@D) # FIXME: A better way?
        $(srcdir)/etc/bash_completion_nmh-gen > $@
 
 etc/mts.conf: $(srcdir)/etc/mts.conf.in Makefile
@@ -868,7 +883,6 @@ etc/mts.conf: $(srcdir)/etc/mts.conf.in Makefile
                                < $(srcdir)/etc/mts.conf.in > $@
 
 etc/mhn.defaults: $(srcdir)/etc/mhn.defaults.sh $(MHNSEARCHPROG)
-       $(MKDIR_P) $(@D) # FIXME: A better way?
        @rm -f $@
        $(srcdir)/etc/mhn.defaults.sh $(MHNSEARCHPATH) $(MHNSEARCHPROG) > $@
 
@@ -990,7 +1004,6 @@ sbr_libmh_a_SOURCES = \
     sbr/mime_type.c \
     sbr/mts.c \
     sbr/netsec.c \
-    sbr/norm_charmap.c \
     sbr/oauth.c \
     sbr/oauth_prof.c \
     sbr/path.c \
@@ -1000,7 +1013,6 @@ sbr_libmh_a_SOURCES = \
     sbr/print_sw.c \
     sbr/print_version.c \
     sbr/push.c \
-    sbr/putenv.c \
     sbr/r1bindex.c \
     sbr/read_line.c \
     sbr/read_switch.c \
@@ -1041,6 +1053,11 @@ sbr_libmh_a_SOURCES = \
 
 sbr_libmh_a_LIBADD = $(LIBOBJS)
 
+##
+## Need explicit dependency so that YACC is run before LEX.
+##
+sbr/icalendar.c: sbr/icalparse.c
+
 ##
 ## Because these files use the definitions in the libmh rule below,
 ## they need to be rebuilt if the Makefile changes.
@@ -1127,7 +1144,7 @@ ChangeLog:
 ## Our RPM build target
 ##
 rpm: dist
-       @test -d $(rpmdir)/SOURCES || $(MKDIR_P) $(rpmdir)/SOURCES
+       @$(MKDIR_P) $(rpmdir)/SOURCES
        @mv -f $(DIST_ARCHIVES) $(rpmdir)/SOURCES
        @cp -p VERSION $(rpmdir)/SOURCES
        @rpmbuild --define '_topdir $(rpmdir)' \