[Morphix-cvs] SF.net SVN: morphix: [2608] trunk/morphixinstaller

[<pa...@us...>]

Revision: 2608
          http://morphix.svn.sourceforge.net/morphix/?rev=2608&view=rev
Author:   paul_c
Date:     2008-01-17 08:00:34 -0800 (Thu, 17 Jan 2008)

Log Message:
-----------
Clean up a couple of compile time warnings and silence a configure warning about
datarootdir.

Modified Paths:
--------------
    trunk/morphixinstaller/autogen.sh
    trunk/morphixinstaller/src/instlib.c

Modified: trunk/morphixinstaller/autogen.sh
===================================================================
--- trunk/morphixinstaller/autogen.sh	2007-12-31 17:03:36 UTC (rev 2607)
+++ trunk/morphixinstaller/autogen.sh	2008-01-17 16:00:34 UTC (rev 2608)
@@ -134,6 +134,10 @@
 	  libtoolize --force --copy
 	fi
       fi
+      # Ward of any complaints about datarootdir being ignored.
+      if test `grep "^pkgdatadir" po/Makefile.in.in 2> /dev/null | wc -l` -eq 0; then
+        echo "pkgdatadir = @datarootdir@" >> po/Makefile.in.in
+      fi
       echo "Running aclocal $aclocalinclude ..."
       aclocal $aclocalinclude
       if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
@@ -141,7 +145,7 @@
 	autoheader
       fi
       echo "Running automake --gnu $am_opt ..."
-      automake --add-missing --gnu $am_opt
+      automake --add-missing --copy --gnu $am_opt
       echo "Running autoconf ..."
       autoconf
     )

Modified: trunk/morphixinstaller/src/instlib.c
===================================================================
--- trunk/morphixinstaller/src/instlib.c	2007-12-31 17:03:36 UTC (rev 2607)
+++ trunk/morphixinstaller/src/instlib.c	2008-01-17 16:00:34 UTC (rev 2608)
@@ -517,10 +517,10 @@
 	gint i = 0;
 	gint j = 0;
 	FILE *file;
-	gint modules_len;
+	gsize modules_len;
 	gchar **contents_array;
 	gchar *contents_etc;
-	gint length;
+	gsize length;
 	gchar temp_str[20];
 
 	/* Make the mountdir */
@@ -694,11 +694,11 @@
 	file = fopen(cmdline,"w");
 	if (file == NULL) {
 		debug("Unable to open %s, something went very wrong during the install. Aborting!\n",cmdline);
-		return FALSE;
+		return;
 	}
 	if (GetSelectedRoot() == NULL || GetSelectedFilesystemName() == NULL || (swapon == TRUE && GetSelectedSwap() == NULL)) {
 		debug("GetSelectedRoot(), GetSelectedFilesystemName() or GetSelectedSwap() returned NULL, aborting install!\n");
-		return FALSE;
+		return;
 	}
 	debug("%s \t / %s \t defaults \t 0 \t 1\n",GetSelectedRoot(),GetSelectedFilesystemName());
 
@@ -1188,7 +1188,8 @@
 */
 
 GString *GetKernelArgumentsString() {
-	int length, i;
+        int i;
+	gsize length;
 	gchar **contents_array = NULL;
 	GString *kernelarguments = g_string_new("");
 	gchar *contents = NULL;
@@ -1633,9 +1634,9 @@
 	gchar *hdd_buffer = NULL;
 	gchar model_buffer[256];
 
-	gint part_len;
-	gint media_len;
-	gint model_len;
+	gsize part_len;
+	gsize media_len;
+	gsize model_len;
 	gint i = 0;
 	gint j = 0;
 	gint hdd_size;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.