Browse Source

Mon Mar 23 01:40:35 1998 Norbert Warmuth <k3190@fh-sw.de>

* gnome/gtools.c (translate_gdk_keysym_to_curses): renamed KEY_BACKTAB
to KEY_BTAB (the name ncurses uses)

* gnome/Makefile.in: Install the icon-files and the layout-file from $srcdir.

* autogen.sh: added support for builddir != srcdir

* doc/Makefile.in: The manual pages are generated files and
located in the builddir and not in the srcdir.

* src/find.c (find_file): Use the same hotkey for the panelize button
as we use with the external panelize command.

* src/myslang.h: --with-ncurses didn't compile: renamed
KEY_BACKTAB to KEY_BTAB (the name ncurses uses)

* src/dlg.c (dlg_key_event): likewise

* src/tkmain.c (x_init_dlg): added dummy function to make it
compile

* vfs/Makefile.in, extfs/extfs.ini, extfs/hp48: New external
filesystem to view and copy files to/from the HP48.

Now it should be possible to build and install gnome edition with
builddir != srcdir.
Norbert Warmuth 27 years ago
parent
commit
e06cd1968c
10 changed files with 50 additions and 14 deletions
  1. 8 1
      autogen.sh
  2. 3 3
      doc/Makefile.in
  3. 7 0
      gnome/ChangeLog
  4. 6 6
      gnome/Makefile.in
  5. 1 1
      gnome/gtools.c
  6. 17 0
      src/ChangeLog
  7. 1 1
      src/dlg.c
  8. 1 1
      src/find.c
  9. 1 1
      src/myslang.h
  10. 5 0
      tk/ChangeLog

+ 8 - 1
autogen.sh

@@ -1,3 +1,10 @@
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+(
+cd $srcdir
 cat macros/gnome.m4 mc-aclocal.m4 > aclocal.m4
 autoconf
-./configure $*
+)
+
+$srcdir/configure $*

+ 3 - 3
doc/Makefile.in

@@ -15,9 +15,9 @@ LINUXDOCDIR =	/usr/local/linuxdoc-sgml
 all:
 
 install:
-	-$(SEDCMD2) < $(srcdir)/mc.1 > $(DESTDIR)$(mandir)/$(manprefix)mc.$(manext)
-	-$(SEDCMD2) < $(srcdir)/mcedit.1 > $(DESTDIR)$(mandir)/$(manprefix)mcedit.$(manext)
-	-$(SEDCMD2) < $(srcdir)/mcserv.8 > $(DESTDIR)$(man8dir)/$(manprefix)mcserv.$(man8ext)
+	-$(SEDCMD2) < mc.1 > $(DESTDIR)$(mandir)/$(manprefix)mc.$(manext)
+	-$(SEDCMD2) < mcedit.1 > $(DESTDIR)$(mandir)/$(manprefix)mcedit.$(manext)
+	-$(SEDCMD2) < mcserv.8 > $(DESTDIR)$(man8dir)/$(manprefix)mcserv.$(man8ext)
 
 uninstall:
 	-cd $(mandir); $(RMF) $(manprefix)mc.$(manext)

+ 7 - 0
gnome/ChangeLog

@@ -1,3 +1,10 @@
+Mon Mar 23 01:40:35 1998  Norbert Warmuth  <k3190@fh-sw.de>
+
+	* gtools.c (translate_gdk_keysym_to_curses): renamed KEY_BACKTAB
+	to KEY_BTAB (the name ncurses uses)
+
+	* Makefile.in: Install the icon-files and the layout-file from $srcdir.
+
 1998-03-20  Federico Mena Quintero  <federico@nuclecu.unam.mx>
 
 	* gdesktop.c (icon_properties): 

+ 6 - 6
gnome/Makefile.in

@@ -44,11 +44,11 @@ GNOMEHDRS = 		\
 	gpageprop.h	\
 	gmc-chargrid.h
 
-ICONS = 			\
-	directory-ok.xpm	\
-	directory.xpm		\
-	multi.xpm		\
-	multi-ok.xpm
+ICONS = 				\
+	$(srcdir)/directory-ok.xpm	\
+	$(srcdir)/directory.xpm		\
+	$(srcdir)/multi.xpm		\
+	$(srcdir)/multi-ok.xpm
 
 #
 # These objects from ../src do not depend on HAVE_X / HAVE_GNOME??
@@ -180,7 +180,7 @@ install_gmc: all
 	$(mcsrcdir)/xmkdir $(DESTDIR)$(bindir)
 	$(INSTALL_PROGRAM) gmc $(DESTDIR)$(bindir)/$(binprefix)gmc
 	$(INSTALL_DATA) $(ICONS) $(DESTDIR)$(icondir)
-	-$(INSTALL_DATA) layout $(DESTDIR)$(libdir)
+	-$(INSTALL_DATA) $(srcdir)/layout $(DESTDIR)$(libdir)
 
 uninstall: 
 	-$(RMF) $(DESTDIR)$(bindir)/$(binprefix)gmc

+ 1 - 1
gnome/gtools.c

@@ -143,7 +143,7 @@ translate_gdk_keysym_to_curses (GdkEventKey *event)
 		return KEY_BACKSPACE;
 	case GDK_Tab:
 		if (event->state & GDK_SHIFT_MASK)
-			return '\t'; /* return KEY_BACKTAB */
+			return '\t'; /* return KEY_BTAB */
 		return '\t';
 	case GDK_KP_Enter:
 	case GDK_Return:

+ 17 - 0
src/ChangeLog

@@ -12,6 +12,23 @@ Mon Mar 23 08:17:55 1998 Pavel Roskin <pavel@absolute.spb.su>
 	
 	* myslang.h: using fast one_vline() and one_hline() for OS2_NT
 	
+Mon Mar 23 00:47:51 1998  Norbert Warmuth  <k3190@fh-sw.de>
+
+	* autogen.sh: added support for builddir != srcdir
+
+	* doc/Makefile.in: The manual pages are generated files and
+	located in the builddir and not in the srcdir.
+
+	* find.c (find_file): Use the same hotkey for the panelize button
+	as we use with the external panelize command.
+
+Fri Mar 20 17:51:01 1998  Norbert Warmuth  <k3190@fh-sw.de>
+
+	* myslang.h: --with-ncurses didn't compile: renamed
+	KEY_BACKTAB to KEY_BTAB (the name ncurses uses)
+
+	* dlg.c (dlg_key_event): likewise
+
 1998-03-19  Miguel de Icaza  <miguel@nuclecu.unam.mx>
 
 	* screen.c: Remove KEY_DC forever.  This should have never been

+ 1 - 1
src/dlg.c

@@ -644,7 +644,7 @@ void dlg_key_event (Dlg_head *h, int d_key)
     int handled;
     
     /* TAB used to cycle */
-    if (!h->raw && (d_key == '\t' || d_key == KEY_BACKTAB))
+    if (!h->raw && (d_key == '\t' || d_key == KEY_BTAB))
 	if (d_key == '\t')
 	    dlg_one_down (h);
         else

+ 1 - 1
src/find.c

@@ -663,7 +663,7 @@ find_file (char *start_dir, char *pattern, char *content, char **dirname,  char
     add_widgetl (find_dlg,
     button_new (FIND2_Y-3, 17, B_VIEW, NORMAL_BUTTON, "&View - F3", find_do_view_file, find_dlg, "button-view"), 0);
     add_widgetl (find_dlg,
-	button_new (FIND2_Y-3, 3, B_PANELIZE, NORMAL_BUTTON, "&Panelize", 0, 0, "button-panelize"),
+	button_new (FIND2_Y-3, 3, B_PANELIZE, NORMAL_BUTTON, "Pane&lize", 0, 0, "button-panelize"),
 	XV_WLAY_CENTERROW);
     add_widgetl (find_dlg, button_new (FIND2_Y-4, 37, B_CANCEL, NORMAL_BUTTON, "&Quit", 0, 0, "button-quit"), 
         XV_WLAY_RIGHTOF);

+ 1 - 1
src/myslang.h

@@ -11,7 +11,7 @@ enum {
     KEY_BACKSPACE = 400,
     KEY_END, KEY_UP, KEY_DOWN, KEY_LEFT, KEY_RIGHT,
     KEY_HOME, KEY_A1, KEY_C1, KEY_NPAGE, KEY_PPAGE, KEY_IC,
-    KEY_ENTER, KEY_DC, KEY_SCANCEL, KEY_BACKTAB
+    KEY_ENTER, KEY_DC, KEY_SCANCEL, KEY_BTAB
 };
 
 #define KEY_F(x) 1000+x

+ 5 - 0
tk/ChangeLog

@@ -1,3 +1,8 @@
+Fri Mar 20 18:41:40 1998  Norbert Warmuth  <k3190@fh-sw.de>
+
+	* tkmain.c (x_init_dlg): added dummy function to make it
+	compile
+
 Mon Mar 16 13:05:47 1998  Pavel Roskin <pavel@absolute.spb.su>
 
 	* tkview.c: Include stdio.h;  Minor spelling corrections added. 

Some files were not shown because too many files changed in this diff