[Tux4kids-commits] r1632 - in tuxtype/trunk: . src

[David Bruce]

Author: dbruce-guest
Date: 2009-11-05 02:29:51 +0000 (Thu, 05 Nov 2009)
New Revision: 1632

Modified:
   tuxtype/trunk/Makefile.am
   tuxtype/trunk/src/editor.c
   tuxtype/trunk/src/titlescreen.c
Log:
fix of permissions problem in make install for custom word lists, and addition of some debugging statements



Modified: tuxtype/trunk/Makefile.am
===================================================================
--- tuxtype/trunk/Makefile.am	2009-11-05 01:40:01 UTC (rev 1631)
+++ tuxtype/trunk/Makefile.am	2009-11-05 02:29:51 UTC (rev 1632)
@@ -44,8 +44,8 @@
 # Sould we skip uninstall of these directories to avoid clobbering user-created files
 # on upgrade?:
 install-data-hook:
-	$(MKDIR_P) -m 755 $(DESTDIR)$(pkglocalstatedir)
-	$(MKDIR_P) -m 755 $(DESTDIR)$(pkgsysconfdir)
+	$(MKDIR_P) -m 777 $(DESTDIR)$(pkglocalstatedir)
+	$(MKDIR_P) -m 777 $(DESTDIR)$(pkgsysconfdir)
 
 uninstall-hook:
 	rm -rf $(DESTDIR)$(pkglocalstatedir)

Modified: tuxtype/trunk/src/editor.c
===================================================================
--- tuxtype/trunk/src/editor.c	2009-11-05 01:40:01 UTC (rev 1631)
+++ tuxtype/trunk/src/editor.c	2009-11-05 02:29:51 UTC (rev 1632)
@@ -840,7 +840,7 @@
   word list*/
 
   /* Write changes to file, if possible: */
-  LOG("In ChooseWord(), about to write changes\n");
+  LOG("In EditWordList(), about to write changes\n");
   fp = fopen(fn,"w");
 
   if (fp)
@@ -861,12 +861,12 @@
 
     fclose(fp); 
     fp = NULL;
-    LOG("In ChooseWord(), changes written successfully\n");
+    LOG("In EditWordList(), changes written successfully\n");
   }
   else
   {
     DEBUGCODE
-    { fprintf(stderr, "In ChooseWord(), unable to open %s for writing\n", fn); }
+    { fprintf(stderr, "In EditWordList(), unable to open %s for writing\n", fn); }
   }
 
   /* --- clear graphics before quitting --- */ 

Modified: tuxtype/trunk/src/titlescreen.c
===================================================================
--- tuxtype/trunk/src/titlescreen.c	2009-11-05 01:40:01 UTC (rev 1631)
+++ tuxtype/trunk/src/titlescreen.c	2009-11-05 02:29:51 UTC (rev 1632)
@@ -1250,6 +1250,8 @@
     if (!wordsFile)
       break; /* Loop continues until break occurs */
 
+    DEBUGCODE { fprintf(stderr, "wordsFile name is: %s\n", wordsFile->d_name); }
+
     /* must have at least .txt at the end */
     if (strlen(wordsFile->d_name) < 5)
       continue;
@@ -1307,6 +1309,8 @@
     if (!wordsFile)
       break; /* Loop continues until break occurs */
 
+    DEBUGCODE { fprintf(stderr, "wordsFile name is: %s\n", wordsFile->d_name); }
+
     /* must have at least .txt at the end */
     if (strlen(wordsFile->d_name) < 5)
       continue;