install python modules to purelib and platlib

[thirdparty/newt.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index e78d574eb762adf55b2569630f2545517a9dc4df..1741ee757359d7d365fb142a239276ffed310b0e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -83,7 +83,8 @@ showkey:      showkey.o $(LIBNEWT)
        $(CC) -g -o showkey showkey.o $(LIBNEWT) $(LDFLAGS) $(LIBS)
 
 _snack.$(SOEXT):   snack.c $(LIBNEWTSH)
-       @[ -n "$(PYTHONVERS)" ] && for ver in $(PYTHONVERS); do \
+ifneq ($(PYTHONVERS),)
+       @for ver in $(PYTHONVERS); do \
                pyconfig=$$ver-config; \
                if ! $$pyconfig --cflags > /dev/null 2>&1 && \
                                python-config --cflags > /dev/null 2>&1; then \
@@ -92,14 +93,13 @@ _snack.$(SOEXT):   snack.c $(LIBNEWTSH)
                fi; \
                mkdir -p $$ver; \
                PCFLAGS=`$$pyconfig --cflags`; \
-               PIFLAGS=`$$pyconfig --includes`; \
-               PLDFLAGS=`$$pyconfig --ldflags`; \
-               PLFLAGS=`$$pyconfig --libs`; \
-               echo $(CC) $(SHCFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snack.o snack.c; \
-               $(CC) $(SHCFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snack.o snack.c; \
-               echo $(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L.  -lnewt $(LIBS); \
-               $(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L.  -lnewt $(LIBS); \
-       done || :
+               PLDFLAGS=`$$pyconfig --ldflags --embed || $$pyconfig --ldflags`; \
+               echo $(CC) $(SHCFLAGS) $(CFLAGS) $(CPPFLAGS) $$PCFLAGS -c -o $$ver/snack.o snack.c; \
+               $(CC) $(SHCFLAGS) $(CFLAGS) $(CPPFLAGS) $$PCFLAGS -c -o $$ver/snack.o snack.c; \
+               echo $(CC) --shared $(LDFLAGS) $$PLDFLAGS -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L. -lnewt $(LIBS); \
+               $(CC) --shared $(LDFLAGS) $$PLDFLAGS -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L. -lnewt $(LIBS); \
+       done
+endif
        touch $@
 
 whiptail: $(NDIALOGOBJS) $(LIBNEWTSH)
@@ -137,27 +137,41 @@ $(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)
+install-sh: sharedlib install-tcl install-py
        [ -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)
-       [ -n "$(WHIPTCLSO)" ] && install -m 755 whiptcl.$(SOEXT) $(instroot)/$(libdir) || :
-       [ -n "$(PYTHONVERS)" ] && for ver in $(PYTHONVERS) ; do \
-          [ -d $(instroot)/$(libdir)/$$ver/site-packages ] || install -m 755 -d $(instroot)/$(libdir)/$$ver/site-packages ;\
-          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)
+
+install-tcl: $(WHIPTCLSO)
+ifneq ($(WHIPTCLSO),)
+       [ -d $(instroot)/$(libdir) ] || install -m 755 -d $(instroot)/$(libdir)
+       install -m 755 $(WHIPTCLSO) $(instroot)/$(libdir)
+endif
+
+install-py: _snack.$(SOEXT)
+ifneq ($(PYTHONVERS),)
+       @for ver in $(PYTHONVERS); do \
+               PLATLIB=`$$ver -c "import sysconfig; print(sysconfig.get_path('platlib'))"`; \
+               PURELIB=`$$ver -c "import sysconfig; print(sysconfig.get_path('purelib'))"`; \
+               [ -d $(instroot)/$$PLATLIB ] || install -m 755 -d $(instroot)/$$PLATLIB ;\
+               [ -d $(instroot)/$$PURELIB ] || install -m 755 -d $(instroot)/$$PURELIB ;\
+               echo install -m 755 $$ver/_snack.$(SOEXT) $(instroot)/$$PLATLIB;\
+               install -m 755 $$ver/_snack.$(SOEXT) $(instroot)/$$PLATLIB;\
+               echo install -m 644 snack.py $(instroot)/$$PURELIB;\
+               install -m 644 snack.py $(instroot)/$$PURELIB;\
+       done
+endif
 
 Makefile: configure.ac
        @echo "You need to rerun ./autogen.sh and ./configure before continuing"
@@ -179,9 +193,6 @@ tag-archive: Makefile
 
 archive: tag-archive create-archive
 
-upload-archive:
-       scp -p newt-$(VERSION).tar.gz fedorahosted.org:newt
-
 ifeq (.depend,$(wildcard .depend))
 include .depend
 endif