projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 50c86d7b AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.1.309 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=ISO-8859-1 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.1.309 | |
| 11 | Problem: Installing and testing with a shadow directory doesn't work. | |
| 12 | (James Vega) | |
| 13 | Solution: Add "po" to the list of directories to link. Also link the Vim | |
| 14 | scripts in testdir. And a few more small fixes. | |
| 15 | Files: src/Makefile | |
| 16 | ||
| 17 | ||
| 18 | *** ../vim-7.1.308/src/Makefile Wed Jun 4 14:28:33 2008 | |
| 19 | --- src/Makefile Sat May 24 15:39:39 2008 | |
| 20 | *************** | |
| 21 | *** 780,785 **** | |
| 22 | --- 780,787 ---- | |
| 23 | # 1) make config | |
| 24 | # 2) edit auto/config.mk, add -n32 to LDFLAGS | |
| 25 | # 3) make | |
| 26 | + # | |
| 27 | + #Alternatively: use -o32 instead of -n32. | |
| 28 | ### | |
| 29 | ||
| 30 | ### (C) On SCO Unix v3.2.5 (and probably other versions) the termcap library, | |
| 31 | *************** | |
| 32 | *** 1074,1080 **** | |
| 33 | # default vi editor, it will create a link from vi to Vim when doing | |
| 34 | # "make install". An existing file will be overwritten! | |
| 35 | # When not using it, some make programs can't handle an undefined $(LINKIT). | |
| 36 | ! #LINKIT = -ln -f -s $(BINDIR)/$(VIMTARGET) /usr/bin/vi | |
| 37 | LINKIT = @echo >/dev/null | |
| 38 | ||
| 39 | ### | |
| 40 | --- 1076,1082 ---- | |
| 41 | # default vi editor, it will create a link from vi to Vim when doing | |
| 42 | # "make install". An existing file will be overwritten! | |
| 43 | # When not using it, some make programs can't handle an undefined $(LINKIT). | |
| 44 | ! #LINKIT = ln -f -s $(DEST_BIN)/$(VIMTARGET) $(DESTDIR)/usr/bin/vi | |
| 45 | LINKIT = @echo >/dev/null | |
| 46 | ||
| 47 | ### | |
| 48 | *************** | |
| 49 | *** 1290,1295 **** | |
| 50 | --- 1292,1300 ---- | |
| 51 | ||
| 52 | DEPEND_CFLAGS = -DPROTO -DDEPEND -DFEAT_GUI $(LINT_CFLAGS) | |
| 53 | ||
| 54 | + # If you have problems with flags that cproto doesn't support, and you are | |
| 55 | + # using GNU make, you can try using the other line to filter out arguments. | |
| 56 | + #PFLAGS = $(PROTO_FLAGS) -DPROTO $(filter -D% -I%, $(LINT_CFLAGS)) | |
| 57 | PFLAGS = $(PROTO_FLAGS) -DPROTO $(LINT_CFLAGS) | |
| 58 | ||
| 59 | ALL_LIB_DIRS = $(GUI_LIBS_DIR) $(X_LIBS_DIR) | |
| 60 | *************** | |
| 61 | *** 2174,2180 **** | |
| 62 | ||
| 63 | shadow: runtime pixmaps | |
| 64 | mkdir $(SHADOWDIR) | |
| 65 | ! cd $(SHADOWDIR); ln -s ../*.[ch] ../*.in ../*.sh ../*.xs ../*.xbm ../toolcheck ../proto ../vimtutor ../gvimtutor ../mkinstalldirs . | |
| 66 | mkdir $(SHADOWDIR)/auto | |
| 67 | cd $(SHADOWDIR)/auto; ln -s ../../auto/configure . | |
| 68 | cd $(SHADOWDIR); rm -f auto/link.sed | |
| 69 | --- 2179,2185 ---- | |
| 70 | ||
| 71 | shadow: runtime pixmaps | |
| 72 | mkdir $(SHADOWDIR) | |
| 73 | ! cd $(SHADOWDIR); ln -s ../*.[ch] ../*.in ../*.sh ../*.xs ../*.xbm ../toolcheck ../proto ../po ../vimtutor ../gvimtutor ../mkinstalldirs . | |
| 74 | mkdir $(SHADOWDIR)/auto | |
| 75 | cd $(SHADOWDIR)/auto; ln -s ../../auto/configure . | |
| 76 | cd $(SHADOWDIR); rm -f auto/link.sed | |
| 77 | *************** | |
| 78 | *** 2193,2199 **** | |
| 79 | cd $(SHADOWDIR)/testdir; ln -s ../../testdir/Makefile \ | |
| 80 | ../../testdir/vimrc.unix \ | |
| 81 | ../../testdir/*.in \ | |
| 82 | ! ../../testdir/unix.vim \ | |
| 83 | ../../testdir/*.ok . | |
| 84 | ||
| 85 | # Link needed for doing "make install" in a shadow directory. | |
| 86 | --- 2198,2204 ---- | |
| 87 | cd $(SHADOWDIR)/testdir; ln -s ../../testdir/Makefile \ | |
| 88 | ../../testdir/vimrc.unix \ | |
| 89 | ../../testdir/*.in \ | |
| 90 | ! ../../testdir/*.vim \ | |
| 91 | ../../testdir/*.ok . | |
| 92 | ||
| 93 | # Link needed for doing "make install" in a shadow directory. | |
| 94 | *** ../vim-7.1.308/src/version.c Wed Jun 4 14:28:28 2008 | |
| 95 | --- src/version.c Wed Jun 4 15:25:00 2008 | |
| 96 | *************** | |
| 97 | *** 668,669 **** | |
| 98 | --- 673,676 ---- | |
| 99 | { /* Add new patch number below this line */ | |
| 100 | + /**/ | |
| 101 | + 309, | |
| 102 | /**/ | |
| 103 | ||
| 104 | -- | |
| 105 | An alien life briefly visits earth. Just before departing it leaves a | |
| 106 | message in the dust on the back of a white van. The world is shocked | |
| 107 | and wants to know what it means. After months of studies the worlds | |
| 108 | best linguistic scientists are able to decipher the message: "Wash me!". | |
| 109 | ||
| 110 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 111 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 112 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 113 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |