[patch] ctwm-3.7_alpha4-gentoo.diff

ctwm-3.7_alpha4-gentoo.diff (text/plain), 1.78 KB, created by Mamoru KOMACHI (RETIRED) on 2003-11-22 05:29:44 UTC

diff -urN ctwm-3.7-alpha4.ORIG/Imakefile ctwm-3.7-alpha4/Imakefile
--- ctwm-3.7-alpha4.ORIG/Imakefile	2003-03-01 01:36:35.000000000 +0900
+++ ctwm-3.7-alpha4/Imakefile	2003-11-22 22:08:54.000000000 +0900
@@ -161,7 +161,7 @@
 
 AllTarget(ctwm)
 
-SpecialObjectRule(parse.o,parse.c,'-DSYSTEM_INIT_FILE="'$(DESTDIR)$(TWMDIR)'/system.ctwmrc"')
+SpecialObjectRule(parse.o,parse.c,'-DSYSTEM_INIT_FILE="'$(DESTDIR)/etc/X11/twm'/system.ctwmrc"')
 SpecialObjectRule(ctwm.o,ctwm.c,'-DPIXMAP_DIRECTORY="'$(DESTDIR)$(TWMDIR)'/images"')
 #if !HasPutenv
 SpecialObjectRule(util.o,util.c,-DNOPUTENV)
@@ -171,7 +171,7 @@
 
 NormalLibraryTarget(ctwm, libctwm.o)
 ComplexProgramTarget(ctwm)
-InstallNonExecFile(system.ctwmrc,$(TWMDIR))
+InstallNonExecFile(system.ctwmrc,/etc/X11/twm)
 #ifdef XPM
 install::
 	MakeDir($(DESTDIR)$(TWMDIR)/images)
diff -urN ctwm-3.7-alpha4.ORIG/gram.y ctwm-3.7-alpha4/gram.y
--- ctwm-3.7-alpha4.ORIG/gram.y	2003-02-21 04:27:28.000000000 +0900
+++ ctwm-3.7-alpha4/gram.y	2003-11-22 20:15:52.000000000 +0900
@@ -433,6 +433,7 @@
 
 		| VIRTUAL_SCREENS      	{ }
 		  geom_list
+		  ;
 
 noarg		: KEYWORD		{ if (!do_single_keyword ($1)) {
 					    twmrc_error_prefix();
@@ -700,7 +701,8 @@
 geom_entries	: /* Empty */
 		| geom_entries geom_entry
 		;
-geom_entry	: string { AddToList (&Scr->VirtualScreens, $1, "") }
+geom_entry	: string { AddToList (&Scr->VirtualScreens, $1, ""); }
+		;
 
 squeeze		: SQUEEZE_TITLE { 
 				    if (HasShape) Scr->SqueezeTitle = TRUE;
@@ -849,8 +851,7 @@
 occupy_workspc_entry	: string {
 				AddToClientsList ($1, client);
 			  }
-                          ;
-
+		;
 occupy_window_list	: LB occupy_window_entries RB {}
 			;
 
@@ -861,7 +862,7 @@
 occupy_window_entry	: string {
 				AddToClientsList (workspace, $1);
 			  }
-
+		;
 icon_list	: LB icon_entries RB {}
 		;