zsh-workers
 help / color / mirror / code / Atom feed
From: Zefram <zefram@dcs.warwick.ac.uk>
To: zsh-workers@math.gatech.edu (Z Shell workers mailing list)
Subject: module installation fixes
Date: Sun, 24 Nov 1996 15:30:32 +0000 (GMT)	[thread overview]
Message-ID: <19825.199611241530@stone.dcs.warwick.ac.uk> (raw)

-----BEGIN PGP SIGNED MESSAGE-----

This patch fixes a couple of problems I didn't immediately notice with
patch 2458:

* "make install" at the top level didn't install the modules.

* The generated header "paths.h" on some systems clashes with a system
  header.

 -zefram

      Index: Makefile.in
      ===================================================================
      RCS file: /home/zefram/usr/cvsroot/zsh/Makefile.in,v
      retrieving revision 1.4
      diff -c -r1.4 Makefile.in
      *** Makefile.in	1996/11/23 00:22:36	1.4
      --- Makefile.in	1996/11/24 14:16:42
      ***************
      *** 89,98 ****
        FORCE:
        
        # install everything
      ! install: install.bin install.man install.info
        
        # install/uninstall just the binary
        install.bin uninstall.bin:
        	cd Src && $(MAKE) $(MAKEDEFS) $@
        
        # install/uninstall just the man pages
      --- 89,102 ----
        FORCE:
        
        # install everything
      ! install: install.bin install.modules install.man install.info
        
        # install/uninstall just the binary
        install.bin uninstall.bin:
      + 	cd Src && $(MAKE) $(MAKEDEFS) $@
      + 
      + # install/uninstall just the modules
      + install.modules uninstall.modules:
        	cd Src && $(MAKE) $(MAKEDEFS) $@
        
        # install/uninstall just the man pages
      Index: Src/Makefile.in
      ===================================================================
      RCS file: /home/zefram/usr/cvsroot/zsh/Src/Makefile.in,v
      retrieving revision 1.9
      diff -c -r1.9 Makefile.in
      *** Src/Makefile.in	1996/11/23 00:22:41	1.9
      --- Src/Makefile.in	1996/11/24 14:14:56
      ***************
      *** 213,231 ****
        
        $(OBJS): $(HDRS)
        
      ! init.o: bltinmods.list paths.h
        
        bltinmods.list: $(MODBINS)
        	( for mod in `cat $(MODBINS)`; do \
        	    echo "DOMOD(mod_boot_$$mod, mod_cleanup_$$mod)"; \
        	done ) > $@
        
      ! paths.h.force:
      ! 	echo '#define MODULE_DIR "'$(MODDIR)'"' > paths.h.tmp
      ! 	if cmp -s paths.h paths.h.tmp; then \
      ! 	    rm -f paths.h.tmp; \
        	else \
      ! 	    mv -f paths.h.tmp paths.h; \
        	fi
        
        $(PROTO): makepro.sed
      --- 213,231 ----
        
        $(OBJS): $(HDRS)
        
      ! init.o: bltinmods.list zshpaths.h
        
        bltinmods.list: $(MODBINS)
        	( for mod in `cat $(MODBINS)`; do \
        	    echo "DOMOD(mod_boot_$$mod, mod_cleanup_$$mod)"; \
        	done ) > $@
        
      ! zshpaths.h.force:
      ! 	echo '#define MODULE_DIR "'$(MODDIR)'"' > zshpaths.h.tmp
      ! 	if cmp -s zshpaths.h zshpaths.h.tmp; then \
      ! 	    rm -f zshpaths.h.tmp; \
        	else \
      ! 	    mv -f zshpaths.h.tmp zshpaths.h; \
        	fi
        
        $(PROTO): makepro.sed
      ***************
      *** 295,301 ****
        	rm -f core stamp-modobjs* *.o $(MODULE_DIR)/*.o *~
        
        clean: mostlyclean
      ! 	rm -f zsh ansi2knr $(@D@LCLEAN) signames.h paths.h bltinmods.list *.*.c *.pro
        
        distclean: clean
        	rm -f Makefile
      --- 295,301 ----
        	rm -f core stamp-modobjs* *.o $(MODULE_DIR)/*.o *~
        
        clean: mostlyclean
      ! 	rm -f zsh ansi2knr $(@D@LCLEAN) signames.h zshpaths.h bltinmods.list *.*.c *.pro
        
        distclean: clean
        	rm -f Makefile
      Index: Src/init.c
      ===================================================================
      RCS file: /home/zefram/usr/cvsroot/zsh/Src/init.c,v
      retrieving revision 1.25
      diff -c -r1.25 init.c
      *** Src/init.c	1996/11/23 00:22:41	1.25
      --- Src/init.c	1996/11/24 14:16:56
      ***************
      *** 32,38 ****
        #define GLOBALS
        #include "zsh.h"
        
      ! #include "paths.h"
        
        int noexitct = 0;
        
      --- 32,38 ----
        #define GLOBALS
        #include "zsh.h"
        
      ! #include "zshpaths.h"
        
        int noexitct = 0;
        

-----BEGIN PGP SIGNATURE-----
Version: 2.6.2

iQCVAwUBMphaJHD/+HJTpU/hAQEtcgQAswFvej/S8WigIYsaDQyZVj8XN0961tEC
hDuq3r0Q3unnd8Vya3DlgEarEQr9sltxRdXoaPj+YuKnBJvD6gMH/Dhus+uw1h78
ulbRPqqCVWepZ4Vu6jh6HmLztzADao6D3gI5Ne0vf6oNso95kLDgVOxWLbDh1jD7
QXP0NW+kPms=
=GcEn
-----END PGP SIGNATURE-----


                 reply	other threads:[~1996-11-24 15:36 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=19825.199611241530@stone.dcs.warwick.ac.uk \
    --to=zefram@dcs.warwick.ac.uk \
    --cc=zsh-workers@math.gatech.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/zsh/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).