install header and pkg-config file with the shared library

This way the shared library can be installed without building whiptail.
This avoids a dependency on libpopt.

diff --git a/Makefile.in b/Makefile.in
index f99118406dd1e594978f2efd829063b099b08873..3502a4c993f209703718a99c7185790d52148b04 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -137,18 +137,17 @@ $(SHAREDDIR)/%.o : %.c
 install: $(LIBNEWT) install-sh whiptail
        [ -d $(instroot)/$(bindir) ] || install -m 755 -d $(instroot)/$(bindir)
        [ -d $(instroot)/$(libdir) ] || install -m 755 -d $(instroot)/$(libdir)
-       [ -d $(instroot)/$(includedir) ] || install -m 755 -d $(instroot)/$(includedir)
        [ -d $(instroot)/$(man1dir) ] || install -m 755 -d $(instroot)/$(man1dir)
-       [ -d $(instroot)/$(pkgconfigdir) ] || install -m 755 -d $(instroot)/$(pkgconfigdir)
-       install -m 644 newt.h $(instroot)/$(includedir)
        install -m 644 $(LIBNEWT) $(instroot)/$(libdir)
        install -m 755 whiptail $(instroot)/$(bindir)
        install -m 644 whiptail.1 $(instroot)/$(man1dir)
        make -C po datadir=$(instroot)/$(datadir) install
-       install -m 644 libnewt.pc $(instroot)/$(pkgconfigdir)
 
 install-sh: sharedlib $(WHIPTCLSO) _snack.$(SOEXT)
        [ -d $(instroot)/$(libdir) ] || install -m 755 -d $(instroot)/$(libdir)
+       [ -d $(instroot)/$(includedir) ] || install -m 755 -d $(instroot)/$(includedir)
+       [ -d $(instroot)/$(pkgconfigdir) ] || install -m 755 -d $(instroot)/$(pkgconfigdir)
+       install -m 644 newt.h $(instroot)/$(includedir)
        install -m 755 $(LIBNEWTSH) $(instroot)/$(libdir)
        ln -sf $(LIBNEWTSONAME) $(instroot)/$(libdir)/libnewt.$(SOEXT)
        ln -sf $(LIBNEWTSH) $(instroot)/$(libdir)/$(LIBNEWTSONAME)
@@ -158,6 +157,7 @@ install-sh: sharedlib $(WHIPTCLSO) _snack.$(SOEXT)
           install -m 755 $$ver/_snack.$(SOEXT) $(instroot)/$(libdir)/$$ver/site-packages ;\
           install -m 644 snack.py $(instroot)/$(libdir)/$$ver/site-packages ;\
        done || :
+       install -m 644 libnewt.pc $(instroot)/$(pkgconfigdir)
 
 Makefile: configure.ac
        @echo "You need to rerun ./autogen.sh and ./configure before continuing"