mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

46 lines
2.1 KiB

  1. diff -Nur nedit-5.5-orig/makefiles/Makefile.linux nedit-5.5/makefiles/Makefile.linux
  2. --- nedit-5.5-orig/makefiles/Makefile.linux 2005-01-03 16:27:48.636034664 +0100
  3. +++ nedit-5.5/makefiles/Makefile.linux 2005-01-03 16:30:00.425999544 +0100
  4. @@ -17,11 +17,11 @@
  5. # To test if the Motif library exports the runtime version
  6. # add -DHAVE__XMVERSIONSTRING to CFLAGS
  7. #
  8. -CFLAGS=-O -I/usr/X11R6/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD
  9. +CFLAGS=-O -I/usr/X11R6/include -D__LINUX__ -DUSE_DIRENT -DUSE_LPR_PRINT_CMD
  10. ARFLAGS=-urs
  11. -LIBS= -L/usr/X11R6/lib -Wl,-Bstatic -lXm -Wl,-Bdynamic -lXp -lXpm -lXext -lXt -lSM -lICE -lX11 -lm
  12. +LIBS= -L/usr/X11R6/lib -lXm -lXp -lXext -lXt -lSM -lICE -lX11 -lm
  13. include Makefile.common
  14. diff -Nur nedit-5.5-orig/source/preferences.c nedit-5.5/source/preferences.c
  15. --- nedit-5.5-orig/source/preferences.c 2005-01-03 16:27:48.711023264 +0100
  16. +++ nedit-5.5/source/preferences.c 2005-01-03 16:32:42.992285712 +0100
  17. @@ -335,14 +335,14 @@
  18. #ifndef VMS
  19. #ifdef linux
  20. {"shellCommands", "ShellCommands", PREF_ALLOC_STRING, "spell:Alt+B:s:EX:\n\
  21. - cat>spellTmp; xterm -e ispell -x spellTmp; cat spellTmp; rm spellTmp\n\
  22. + cat>spellTmp; xterm -e aspell -c -x spellTmp; cat spellTmp; rm spellTmp\n\
  23. wc::w:ED:\nwc | awk '{print $1 \" lines, \" $2 \" words, \" $3 \" characters\"}'\n\
  24. sort::o:EX:\nsort\nnumber lines::n:AW:\nnl -ba\nmake:Alt+Z:m:W:\nmake\n\
  25. expand::p:EX:\nexpand\nunexpand::u:EX:\nunexpand\n",
  26. &TempStringPrefs.shellCmds, NULL, True},
  27. #elif __FreeBSD__
  28. {"shellCommands", "ShellCommands", PREF_ALLOC_STRING, "spell:Alt+B:s:EX:\n\
  29. - cat>spellTmp; xterm -e ispell -x spellTmp; cat spellTmp; rm spellTmp\n\
  30. + cat>spellTmp; xterm -e aspell -c -x spellTmp; cat spellTmp; rm spellTmp\n\
  31. wc::w:ED:\nwc | awk '{print $2 \" lines, \" $1 \" words, \" $3 \" characters\"}'\n\
  32. sort::o:EX:\nsort\nnumber lines::n:AW:\npr -tn\nmake:Alt+Z:m:W:\nmake\n\
  33. expand::p:EX:\nexpand\nunexpand::u:EX:\nunexpand\n",
  34. @@ -928,6 +928,8 @@
  35. {"shell", "Shell", PREF_STRING,
  36. #if defined(__MVS__) || defined(__EMX__)
  37. "/bin/sh",
  38. +#elif __LINUX__
  39. + "/bin/sh",
  40. #else
  41. "/bin/csh",
  42. #endif