To: [email protected]
Subject: patch 5.5a.6
Fcc: outbox
From: Bram Moolenaar <[email protected]>
------------

Patch 5.5a.6
Problem:    Compiling with gcc on Win32, using the Unix Makefile, didn't work.
Solution:   Add $(SUFFIX) to all places where an executable is used.  Also
           pass it to ctags.  (Reynolds)
Files:      src/Makefile


*** ../vim-5.5a.5/src/Makefile  Mon Aug 30 10:40:59 1999
--- src/Makefile        Wed Sep  1 18:31:20 1999
***************
*** 655,673 ****

 ##################### end of system specific lines ###################

! ### Name of the targets
! VIMTARGET     = vim
! EXTARGET      = ex
! VIEWTARGET    = view
! GVIMTARGET    = g$(VIMTARGET)
! GVIEWTARGET   = g$(VIEWTARGET)
! RVIMTARGET    = r$(VIMTARGET)
! RVIEWTARGET   = r$(VIEWTARGET)
! RGVIMTARGET   = r$(GVIMTARGET)
! RGVIEWTARGET  = r$(GVIEWTARGET)

 ### Names of the tools that are also made
! TOOLS = ctags/ctags xxd/xxd

 ### Installation directories.  The defaults come from configure.
 #
--- 655,682 ----

 ##################### end of system specific lines ###################

! ### Names of the programs and targets
! VIMNAME               = vim
! VIMTARGET     = $(VIMNAME)$(SUFFIX)
! EXNAME                = ex
! EXTARGET      = $(EXNAME)$(SUFFIX)
! VIEWNAME      = view
! VIEWTARGET    = $(VIEWNAME)$(SUFFIX)
! GVIMNAME      = g$(VIMNAME)
! GVIMTARGET    = $(GVIMNAME)$(SUFFIX)
! GVIEWNAME     = g$(VIEWNAME)
! GVIEWTARGET   = $(GVIEWNAME)$(SUFFIX)
! RVIMNAME      = r$(VIMNAME)
! RVIMTARGET    = $(RVIMNAME)$(SUFFIX)
! RVIEWNAME     = r$(VIEWNAME)
! RVIEWTARGET   = $(RVIEWNAME)$(SUFFIX)
! RGVIMNAME     = r$(GVIMNAME)
! RGVIMTARGET   = $(RGVIMNAME)$(SUFFIX)
! RGVIEWNAME    = r$(GVIEWNAME)
! RGVIEWTARGET  = $(RGVIEWNAME)$(SUFFIX)

 ### Names of the tools that are also made
! TOOLS = ctags/ctags$(SUFFIX) xxd/xxd$(SUFFIX)

 ### Installation directories.  The defaults come from configure.
 #
***************
*** 676,690 ****
 # Uncomment the next line to install Vim in your home directory.
 #prefix = $(HOME)

! ### exec_prefix       is the top directory for the executable (default ${prefix})
 #
 # Uncomment the next line to install the Vim executable in "/usr/machine/bin"
 #exec_prefix = /usr/machine

! ### BINDIR    dir for the executable   (default "${exec_prefix}/bin")
! ### MANDIR    dir for the manual pages (default "${prefix}/man")
! ### DATADIR   dir for the other files  (default "${prefix}/lib" or
! #                                               "${prefix}/share")
 # They may be different when using different architectures for the
 # executable and a common directory for the other files.
 #
--- 685,699 ----
 # Uncomment the next line to install Vim in your home directory.
 #prefix = $(HOME)

! ### exec_prefix       is the top directory for the executable (default $(prefix))
 #
 # Uncomment the next line to install the Vim executable in "/usr/machine/bin"
 #exec_prefix = /usr/machine

! ### BINDIR    dir for the executable   (default "$(exec_prefix)/bin")
! ### MANDIR    dir for the manual pages (default "$(prefix)/man")
! ### DATADIR   dir for the other files  (default "$(prefix)/lib" or
! #                                               "$(prefix)/share")
 # They may be different when using different architectures for the
 # executable and a common directory for the other files.
 #
***************
*** 852,861 ****
                       $(BINDIR)/$(GVIEWTARGET) \
                       $(BINDIR)/$(RGVIMTARGET) \
                       $(BINDIR)/$(RGVIEWTARGET)
! GTK_MAN_TARGETS = $(MANSUBDIR)/$(GVIMTARGET).1 \
!                       $(MANSUBDIR)/$(GVIEWTARGET).1 \
!                       $(MANSUBDIR)/$(RGVIMTARGET).1 \
!                       $(MANSUBDIR)/$(RGVIEWTARGET).1
 GTK_TESTTARGET = gui

 ### Motif GUI interface.
--- 861,870 ----
                       $(BINDIR)/$(GVIEWTARGET) \
                       $(BINDIR)/$(RGVIMTARGET) \
                       $(BINDIR)/$(RGVIEWTARGET)
! GTK_MAN_TARGETS = $(MANSUBDIR)/$(GVIMNAME).1 \
!                       $(MANSUBDIR)/$(GVIEWNAME).1 \
!                       $(MANSUBDIR)/$(RGVIMNAME).1 \
!                       $(MANSUBDIR)/$(RGVIEWNAME).1
 GTK_TESTTARGET = gui

 ### Motif GUI interface.
***************
*** 871,880 ****
                       $(BINDIR)/$(GVIEWTARGET) \
                       $(BINDIR)/$(RGVIMTARGET) \
                       $(BINDIR)/$(RGVIEWTARGET)
! MOTIF_MAN_TARGETS = $(MANSUBDIR)/$(GVIMTARGET).1 \
!                       $(MANSUBDIR)/$(GVIEWTARGET).1 \
!                       $(MANSUBDIR)/$(RGVIMTARGET).1 \
!                       $(MANSUBDIR)/$(RGVIEWTARGET).1
 MOTIF_TESTTARGET = gui

 #For SunOS (Solaris) you might want to use this line:
--- 880,889 ----
                       $(BINDIR)/$(GVIEWTARGET) \
                       $(BINDIR)/$(RGVIMTARGET) \
                       $(BINDIR)/$(RGVIEWTARGET)
! MOTIF_MAN_TARGETS = $(MANSUBDIR)/$(GVIMNAME).1 \
!                       $(MANSUBDIR)/$(GVIEWNAME).1 \
!                       $(MANSUBDIR)/$(RGVIMNAME).1 \
!                       $(MANSUBDIR)/$(RGVIEWNAME).1
 MOTIF_TESTTARGET = gui

 #For SunOS (Solaris) you might want to use this line:
***************
*** 905,914 ****
                       $(BINDIR)/$(GVIEWTARGET) \
                       $(BINDIR)/$(RGVIMTARGET) \
                       $(BINDIR)/$(RGVIEWTARGET)
! ATHENA_MAN_TARGETS = $(MANSUBDIR)/$(GVIMTARGET).1 \
!                       $(MANSUBDIR)/$(GVIEWTARGET).1 \
!                       $(MANSUBDIR)/$(RGVIMTARGET).1 \
!                       $(MANSUBDIR)/$(RGVIEWTARGET).1
 ATHENA_TESTTARGET = gui

 ### (J)  Sun OpenWindows 3.2 (SunOS 4.1.x) or earlier that produce these ld
--- 914,923 ----
                       $(BINDIR)/$(GVIEWTARGET) \
                       $(BINDIR)/$(RGVIMTARGET) \
                       $(BINDIR)/$(RGVIEWTARGET)
! ATHENA_MAN_TARGETS = $(MANSUBDIR)/$(GVIMNAME).1 \
!                       $(MANSUBDIR)/$(GVIEWNAME).1 \
!                       $(MANSUBDIR)/$(RGVIMNAME).1 \
!                       $(MANSUBDIR)/$(RGVIEWNAME).1
 ATHENA_TESTTARGET = gui

 ### (J)  Sun OpenWindows 3.2 (SunOS 4.1.x) or earlier that produce these ld
***************
*** 935,944 ****
                       $(BINDIR)/$(GVIEWTARGET) \
                       $(BINDIR)/$(RGVIMTARGET) \
                       $(BINDIR)/$(RGVIEWTARGET)
! BEOSGUI_MAN_TARGETS = $(MANSUBDIR)/$(GVIMTARGET).1 \
!                       $(MANSUBDIR)/$(GVIEWTARGET).1 \
!                       $(MANSUBDIR)/$(RGVIMTARGET).1 \
!                       $(MANSUBDIR)/$(RGVIEWTARGET).1
 BEOSGUI_TESTTARGET = gui

 # GUI files used for making ctags
--- 944,953 ----
                       $(BINDIR)/$(GVIEWTARGET) \
                       $(BINDIR)/$(RGVIMTARGET) \
                       $(BINDIR)/$(RGVIEWTARGET)
! BEOSGUI_MAN_TARGETS = $(MANSUBDIR)/$(GVIMNAME).1 \
!                       $(MANSUBDIR)/$(GVIEWNAME).1 \
!                       $(MANSUBDIR)/$(RGVIMNAME).1 \
!                       $(MANSUBDIR)/$(RGVIEWNAME).1
 BEOSGUI_TESTTARGET = gui

 # GUI files used for making ctags
***************
*** 1196,1215 ****
 # A shell script is used to try linking without unneccesary libraries.
 $(VIMTARGET): config.mk $(OBJ) version.c version.h
       $(CC) -c $(ALL_CFLAGS) version.c
!       @LINK="$(PURIFY) $(SHRPENV) $(CC) $(LDFLAGS) -o $(VIMTARGET) $(OBJ) version.o $(ALL_LIBS)" \
!               MAKE="$(MAKE)" sh $(srcdir)/link.sh

 CTAGSFILES =  ctags/entry.c ctags/main.c ctags/parse.c ctags/sort.c \
               ctags/get.c ctags/options.c ctags/read.c ctags/strstr.c \
               ctags/config.h ctags/ctags.h

! ctags/ctags: ctags/Makefile $(CTAGSFILES)
!       cd ctags; CC="$(CC)" CFLAGS="$(CFLAGS)" $(MAKE) -f Makefile

 ctags/Makefile ctags/config.h: ctags/Makefile.in
!       cd ctags; CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --mandir="$(MANDIR)" --exec_prefix="$(exec_prefix)"

! xxd/xxd: xxd/xxd.c
       cd xxd; CC="$(CC)" CFLAGS="$(CFLAGS)" $(MAKE) -f Makefile.unix

 # Generate function prototypes.  This is not needed to compile vim, but if
--- 1205,1228 ----
 # A shell script is used to try linking without unneccesary libraries.
 $(VIMTARGET): config.mk $(OBJ) version.c version.h
       $(CC) -c $(ALL_CFLAGS) version.c
!       @LINK="$(PURIFY) $(SHRPENV) $(CC) $(LDFLAGS) -o $(VIMTARGET) \
!               $(OBJ) version.o $(ALL_LIBS)" MAKE="$(MAKE)" \
!               sh $(srcdir)/link.sh

 CTAGSFILES =  ctags/entry.c ctags/main.c ctags/parse.c ctags/sort.c \
               ctags/get.c ctags/options.c ctags/read.c ctags/strstr.c \
               ctags/config.h ctags/ctags.h

! ctags/ctags$(SUFFIX): ctags/Makefile $(CTAGSFILES)
!       cd ctags; CC="$(CC)" CFLAGS="$(CFLAGS)" \
!               $(MAKE) -f Makefile SUFFIX="$(SUFFIX)"

 ctags/Makefile ctags/config.h: ctags/Makefile.in
!       cd ctags; SUFFIX="$(SUFFIX)" CC="$(CC)" CFLAGS="$(CFLAGS)" \
!               LDFLAGS="$(LDFLAGS)" \
!               ./configure --mandir="$(MANDIR)" --exec_prefix="$(exec_prefix)"

! xxd/xxd$(SUFFIX): xxd/xxd.c
       cd xxd; CC="$(CC)" CFLAGS="$(CFLAGS)" $(MAKE) -f Makefile.unix

 # Generate function prototypes.  This is not needed to compile vim, but if
***************
*** 1295,1313 ****
 installvim: installvimbin installvimhelp installlinks installhelplinks installmacros installtutor

 installvimbin: $(VIMTARGET) $(exec_prefix) $(BINDIR)
!       -if test -f $(BINDIR)/$(VIMTARGET)$(SUFFIX); then \
!         mv -f $(BINDIR)/$(VIMTARGET)$(SUFFIX) $(BINDIR)/$(VIMTARGET).rm; \
!         rm -f $(BINDIR)/$(VIMTARGET).rm; \
       fi
!       $(INSTALL_PROG) $(VIMTARGET)$(SUFFIX) $(BINDIR)
!       $(STRIP) $(BINDIR)/$(VIMTARGET)$(SUFFIX)
!       chmod $(BINMOD) $(BINDIR)/$(VIMTARGET)$(SUFFIX)
 # may create a link to the new executable from /usr/bin/vi
       -$(LINKIT)

 # install the help files; first adjust the contents for the location
 installvimhelp: $(HELPSOURCE)/vim.1 $(MANSUBDIR) $(VIMLOC) $(VIMRTLOC) $(HELPSUBLOC) $(SYNSUBLOC) $(TUTORSUBLOC)
!       @echo generating $(MANSUBDIR)/$(VIMTARGET).1
       @sed -e s+/usr/local/lib/vim+$(VIMLOC)+ \
               -e s+$(VIMLOC)/doc+$(HELPENDLOC)+ \
               -e s+$(VIMLOC)/syntax+$(SYNTAXENDLOC)+ \
--- 1308,1326 ----
 installvim: installvimbin installvimhelp installlinks installhelplinks installmacros installtutor

 installvimbin: $(VIMTARGET) $(exec_prefix) $(BINDIR)
!       -if test -f $(BINDIR)/$(VIMTARGET); then \
!         mv -f $(BINDIR)/$(VIMTARGET) $(BINDIR)/$(VIMNAME).rm; \
!         rm -f $(BINDIR)/$(VIMNAME).rm; \
       fi
!       $(INSTALL_PROG) $(VIMTARGET) $(BINDIR)
!       $(STRIP) $(BINDIR)/$(VIMTARGET)
!       chmod $(BINMOD) $(BINDIR)/$(VIMTARGET)
 # may create a link to the new executable from /usr/bin/vi
       -$(LINKIT)

 # install the help files; first adjust the contents for the location
 installvimhelp: $(HELPSOURCE)/vim.1 $(MANSUBDIR) $(VIMLOC) $(VIMRTLOC) $(HELPSUBLOC) $(SYNSUBLOC) $(TUTORSUBLOC)
!       @echo generating $(MANSUBDIR)/$(VIMNAME).1
       @sed -e s+/usr/local/lib/vim+$(VIMLOC)+ \
               -e s+$(VIMLOC)/doc+$(HELPENDLOC)+ \
               -e s+$(VIMLOC)/syntax+$(SYNTAXENDLOC)+ \
***************
*** 1320,1332 ****
               -e s+$(VIMLOC)/ftoff.vim+$(SCRIPTENDLOC)/ftoff.vim+ \
               -e s+$(VIMLOC)/scripts.vim+$(SCRIPTENDLOC)/scripts.vim+ \
               -e s+$(VIMLOC)/optwin.vim+$(SCRIPTENDLOC)/optwin.vim+ \
!               $(HELPSOURCE)/vim.1 > $(MANSUBDIR)/$(VIMTARGET).1
!       chmod $(MANMOD) $(MANSUBDIR)/$(VIMTARGET).1
!       @echo generating $(MANSUBDIR)/$(VIMTARGET)tutor.1
       @sed -e s+/usr/local/lib/vim+$(VIMLOC)+ \
               -e s+$(VIMLOC)/tutor+$(TUTORENDLOC)+ \
!               $(HELPSOURCE)/vimtutor.1 > $(MANSUBDIR)/$(VIMTARGET)tutor.1
!       chmod $(MANMOD) $(MANSUBDIR)/$(VIMTARGET)tutor.1
       cd $(HELPSOURCE); $(INSTALL_DATA) *.txt tags $(HELPSUBLOC)
       cd $(HELPSUBLOC); chmod $(HELPMOD) *.txt tags
       $(INSTALL_DATA)  $(HELPSOURCE)/*.pl $(HELPSUBLOC)
--- 1333,1345 ----
               -e s+$(VIMLOC)/ftoff.vim+$(SCRIPTENDLOC)/ftoff.vim+ \
               -e s+$(VIMLOC)/scripts.vim+$(SCRIPTENDLOC)/scripts.vim+ \
               -e s+$(VIMLOC)/optwin.vim+$(SCRIPTENDLOC)/optwin.vim+ \
!               $(HELPSOURCE)/vim.1 > $(MANSUBDIR)/$(VIMNAME).1
!       chmod $(MANMOD) $(MANSUBDIR)/$(VIMNAME).1
!       @echo generating $(MANSUBDIR)/$(VIMNAME)tutor.1
       @sed -e s+/usr/local/lib/vim+$(VIMLOC)+ \
               -e s+$(VIMLOC)/tutor+$(TUTORENDLOC)+ \
!               $(HELPSOURCE)/vimtutor.1 > $(MANSUBDIR)/$(VIMNAME)tutor.1
!       chmod $(MANMOD) $(MANSUBDIR)/$(VIMNAME)tutor.1
       cd $(HELPSOURCE); $(INSTALL_DATA) *.txt tags $(HELPSUBLOC)
       cd $(HELPSUBLOC); chmod $(HELPMOD) *.txt tags
       $(INSTALL_DATA)  $(HELPSOURCE)/*.pl $(HELPSUBLOC)
***************
*** 1368,1375 ****
 # install helper programs ctags and xxd
 installtools: $(TOOLS) $(exec_prefix) $(BINDIR) $(MANSUBDIR) \
               $(TOOLSSOURCE) $(VIMLOC) $(VIMRTLOC) $(TOOLSSUBLOC)
!       cd ctags; mandir="$(MANDIR)" exec_prefix="$(exec_prefix)" \
!               bindir="$(BINDIR)" $(MAKE) -e -f Makefile install
       if test -f $(BINDIR)/xxd$(SUFFIX); then \
         mv -f $(BINDIR)/xxd$(SUFFIX) $(BINDIR)/xxd.rm; \
         rm -f $(BINDIR)/xxd.rm; \
--- 1381,1389 ----
 # install helper programs ctags and xxd
 installtools: $(TOOLS) $(exec_prefix) $(BINDIR) $(MANSUBDIR) \
               $(TOOLSSOURCE) $(VIMLOC) $(VIMRTLOC) $(TOOLSSUBLOC)
!       cd ctags; mandir="$(MANDIR)" \
!               exec_prefix="$(exec_prefix)" bindir="$(BINDIR)" \
!               $(MAKE) -e -f Makefile  SUFFIX="$(SUFFIX)" install
       if test -f $(BINDIR)/xxd$(SUFFIX); then \
         mv -f $(BINDIR)/xxd$(SUFFIX) $(BINDIR)/xxd.rm; \
         rm -f $(BINDIR)/xxd.rm; \
***************
*** 1389,1395 ****

 $(exec_prefix) $(BINDIR) $(MANSUBDIR) $(VIMLOC) $(VIMRTLOC) $(HELPSUBLOC) \
               $(SYNSUBLOC) $(MACROSUBLOC) $(TOOLSSUBLOC) $(TUTORSUBLOC):
!       -ctags/mkinstalldirs $@
       -chmod $(DIRMOD) $@

 # create links from various names to vim.  This is only done when the links
--- 1403,1409 ----

 $(exec_prefix) $(BINDIR) $(MANSUBDIR) $(VIMLOC) $(VIMRTLOC) $(HELPSUBLOC) \
               $(SYNSUBLOC) $(MACROSUBLOC) $(TOOLSSUBLOC) $(TUTORSUBLOC):
!       -$(SHELL) ctags/mkinstalldirs $@
       -chmod $(DIRMOD) $@

 # create links from various names to vim.  This is only done when the links
***************
*** 1422,1456 ****

 # create links for the manual pages with various names to vim.  This is only
 # done when the links (or manpages with the same name) don't exist yet.
! installhelplinks: $(GUI_MAN_TARGETS) $(MANSUBDIR)/$(EXTARGET).1 $(MANSUBDIR)/$(VIEWTARGET).1 $(MANSUBDIR)/$(RVIMTARGET).1 $(MANSUBDIR)/$(RVIEWTARGET).1

! $(MANSUBDIR)/$(EXTARGET).1:
!       cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(EXTARGET).1

! $(MANSUBDIR)/$(VIEWTARGET).1:
!       cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(VIEWTARGET).1

! $(MANSUBDIR)/$(GVIMTARGET).1:
!       cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(GVIMTARGET).1

! $(MANSUBDIR)/$(GVIEWTARGET).1:
!       cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(GVIEWTARGET).1

! $(MANSUBDIR)/$(RVIMTARGET).1:
!       cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(RVIMTARGET).1

! $(MANSUBDIR)/$(RVIEWTARGET).1:
!       cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(RVIEWTARGET).1

! $(MANSUBDIR)/$(RGVIMTARGET).1:
!       cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(RGVIMTARGET).1

! $(MANSUBDIR)/$(RGVIEWTARGET).1:
!       cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(RGVIEWTARGET).1

 uninstall: uninstall_runtime
!       -rm -f $(BINDIR)/$(VIMTARGET)$(SUFFIX)
!       -rm -f $(MANSUBDIR)/$(VIMTARGET).1 $(MANSUBDIR)/$(VIMTARGET)tutor.1
       -rm -f $(BINDIR)/vimtutor
       -rm -f $(BINDIR)/ctags$(SUFFIX) $(MANSUBDIR)/ctags.1
       -rm -f $(BINDIR)/xxd$(SUFFIX) $(MANSUBDIR)/xxd.1
--- 1436,1470 ----

 # create links for the manual pages with various names to vim.  This is only
 # done when the links (or manpages with the same name) don't exist yet.
! installhelplinks: $(GUI_MAN_TARGETS) $(MANSUBDIR)/$(EXNAME).1 $(MANSUBDIR)/$(VIEWNAME).1 $(MANSUBDIR)/$(RVIMNAME).1 $(MANSUBDIR)/$(RVIEWNAME).1

! $(MANSUBDIR)/$(EXNAME).1:
!       cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(EXNAME).1

! $(MANSUBDIR)/$(VIEWNAME).1:
!       cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(VIEWNAME).1

! $(MANSUBDIR)/$(GVIMNAME).1:
!       cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(GVIMNAME).1

! $(MANSUBDIR)/$(GVIEWNAME).1:
!       cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(GVIEWNAME).1

! $(MANSUBDIR)/$(RVIMNAME).1:
!       cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(RVIMNAME).1

! $(MANSUBDIR)/$(RVIEWNAME).1:
!       cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(RVIEWNAME).1

! $(MANSUBDIR)/$(RGVIMNAME).1:
!       cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(RGVIMNAME).1

! $(MANSUBDIR)/$(RGVIEWNAME).1:
!       cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(RGVIEWNAME).1

 uninstall: uninstall_runtime
!       -rm -f $(BINDIR)/$(VIMTARGET)
!       -rm -f $(MANSUBDIR)/$(VIMNAME).1 $(MANSUBDIR)/$(VIMNAME)tutor.1
       -rm -f $(BINDIR)/vimtutor
       -rm -f $(BINDIR)/ctags$(SUFFIX) $(MANSUBDIR)/ctags.1
       -rm -f $(BINDIR)/xxd$(SUFFIX) $(MANSUBDIR)/xxd.1
***************
*** 1458,1467 ****
       -rm -f $(BINDIR)/$(GVIMTARGET) $(BINDIR)/$(GVIEWTARGET)
       -rm -f $(BINDIR)/$(RVIMTARGET) $(BINDIR)/$(RVIEWTARGET)
       -rm -f $(BINDIR)/$(RGVIMTARGET) $(BINDIR)/$(RGVIEWTARGET)
!       -rm -f $(MANSUBDIR)/$(EXTARGET).1 $(MANSUBDIR)/$(VIEWTARGET).1
!       -rm -f $(MANSUBDIR)/$(GVIMTARGET).1 $(MANSUBDIR)/$(GVIEWTARGET).1
!       -rm -f $(MANSUBDIR)/$(RVIMTARGET).1 $(MANSUBDIR)/$(RVIEWTARGET).1
!       -rm -f $(MANSUBDIR)/$(RGVIMTARGET).1 $(MANSUBDIR)/$(RGVIEWTARGET).1

 uninstall_runtime:
       -rm -f $(HELPSUBLOC)/*.txt $(HELPSUBLOC)/tags $(HELPSUBLOC)/*.pl
--- 1472,1481 ----
       -rm -f $(BINDIR)/$(GVIMTARGET) $(BINDIR)/$(GVIEWTARGET)
       -rm -f $(BINDIR)/$(RVIMTARGET) $(BINDIR)/$(RVIEWTARGET)
       -rm -f $(BINDIR)/$(RGVIMTARGET) $(BINDIR)/$(RGVIEWTARGET)
!       -rm -f $(MANSUBDIR)/$(EXNAME).1 $(MANSUBDIR)/$(VIEWNAME).1
!       -rm -f $(MANSUBDIR)/$(GVIMNAME).1 $(MANSUBDIR)/$(GVIEWNAME).1
!       -rm -f $(MANSUBDIR)/$(RVIMNAME).1 $(MANSUBDIR)/$(RVIEWNAME).1
!       -rm -f $(MANSUBDIR)/$(RGVIMNAME).1 $(MANSUBDIR)/$(RGVIEWNAME).1

 uninstall_runtime:
       -rm -f $(HELPSUBLOC)/*.txt $(HELPSUBLOC)/tags $(HELPSUBLOC)/*.pl
***************
*** 1477,1487 ****
 # Clean up all the files that have been produced, except configure's.
 # We support common typing mistakes for Juergen! :-)
 clean celan: testclean
!       -rm -f *.o core $(VIMTARGET).core $(VIMTARGET)$(SUFFIX) xxd/*.o
       -rm -f $(TOOLS) osdef.h pathdef.c if_perl.c
       -rm -f conftest* *~ link.sed
       if test -f ctags/Makefile; then \
!               cd ctags; $(MAKE) -f Makefile clean; \
       fi

 shadow:       runtime pixmaps
--- 1491,1501 ----
 # Clean up all the files that have been produced, except configure's.
 # We support common typing mistakes for Juergen! :-)
 clean celan: testclean
!       -rm -f *.o core $(VIMTARGET).core $(VIMTARGET) xxd/*.o
       -rm -f $(TOOLS) osdef.h pathdef.c if_perl.c
       -rm -f conftest* *~ link.sed
       if test -f ctags/Makefile; then \
!               cd ctags; $(MAKE) -f Makefile SUFFIX="$(SUFFIX)" clean; \
       fi

 shadow:       runtime pixmaps
***************
*** 1515,1521 ****
 scrub scratch:
       -rm -f config.status config.cache config.h config.log
       -if test -f ctags/Makefile; then \
!               cd ctags; $(MAKE) -f Makefile distclean; \
       fi

 distclean: clean scratch
--- 1529,1535 ----
 scrub scratch:
       -rm -f config.status config.cache config.h config.log
       -if test -f ctags/Makefile; then \
!               cd ctags; $(MAKE) -f Makefile SUFFIX="$(SUFFIX)" distclean; \
       fi

 distclean: clean scratch
***************
*** 1588,1594 ****
               $(ALL_CFLAGS)

 osdef.h: osdef.sh config.h osdef1.h.in osdef2.h.in
!       CC="$(CC) $(ALL_CFLAGS)" srcdir=${srcdir} sh $(srcdir)/osdef.sh

 pathdef.c: Makefile config.mk
       -@echo creating pathdef.c
--- 1602,1608 ----
               $(ALL_CFLAGS)

 osdef.h: osdef.sh config.h osdef1.h.in osdef2.h.in
!       CC="$(CC) $(ALL_CFLAGS)" srcdir=$(srcdir) sh $(srcdir)/osdef.sh

 pathdef.c: Makefile config.mk
       -@echo creating pathdef.c
*** ../vim-5.5a.5/src/version.c Wed Sep  1 18:12:16 1999
--- src/version.c       Wed Sep  1 19:33:57 1999
***************
*** 420,420 ****
--- 420,421 ----
 {   /* Add new patch number below this line */
+     6,

--
A poem:                read aloud:

<> !*''#               Waka waka bang splat tick tick hash,
^"`$$-                 Caret quote back-tick dollar dollar dash,
!*=@$_                 Bang splat equal at dollar under-score,
%*<> ~#4               Percent splat waka waka tilde number four,
&[]../                 Ampersand bracket bracket dot dot slash,
|{,,SYSTEM HALTED      Vertical-bar curly-bracket comma comma CRASH.

Fred Bremmer and Steve Kroese (Calvin College & Seminary of Grand Rapids, MI.)

--/-/---- Bram Moolenaar ---- [email protected] ---- [email protected] ---\-\--
 \ \    www.vim.org/iccf      www.moolenaar.net       www.vim.org    / /

You are viewing proxied material from ftp.icm.edu.pl. The copyright of proxied material belongs to its original authors. Any comments or complaints in relation to proxied material should be directed to the original authors of the content concerned. Please see the disclaimer for more details.