sw_build: Bug squashing.

[sw-tools] / src / sw_info.c

diff --git a/src/sw_info.c b/src/sw_info.c
index 82204d390ac0f45bc1d39cb45d057f112f4b43d6..2dad0ca1f684b8305164897b707a3bee7970724e 100644 (file)
--- a/src/sw_info.c
+++ b/src/sw_info.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
 /* -*-c-*-
  *

- * $Id: sw_info.c,v 1.3 1999/06/24 15:51:59 mdw Exp $
+ * $Id: sw_info.c,v 1.6 2004/04/08 01:52:19 mdw Exp $

  *
  * Maintenance of `.sw-info' files
  *
  *
  * Maintenance of `.sw-info' files
  *


@@ -26,20 +26,6 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 

-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: sw_info.c,v $
- * Revision 1.3  1999/06/24 15:51:59  mdw
- * Add support for the `sw-precommit' script.
- *
- * Revision 1.2  1999/06/18 18:58:45  mdw
- * Various tidyings.
- *
- * Revision 1.1.1.1  1999/06/02 16:53:35  mdw
- * Initial import.
- *
- */
-

 /*----- Header files ------------------------------------------------------*/
 
 #include "config.h"
 /*----- Header files ------------------------------------------------------*/
 
 #include "config.h"


@@ -475,13 +461,13 @@ int sw_commit(int argc, char *argv[])
       env_put(&t, "SW_MAINTAINER", sw.maintainer);
       env_put(&t, "SW_DATE", sw.date);
       env_put(&t, "SW_ARCHLIST", sw.arch);
       env_put(&t, "SW_MAINTAINER", sw.maintainer);
       env_put(&t, "SW_DATE", sw.date);
       env_put(&t, "SW_ARCHLIST", sw.arch);

-      env_put(&t, "SW_PREFIX", sw.prefix);
+      env_put(&t, "SW_PREFIX", PREFIX);

       environ = env_export(&t);
 
       /* --- Run the commit check script --- */
 
       execl(PREFIX "/share/sw-precommit", "sw-precommit",
       environ = env_export(&t);
 
       /* --- Run the commit check script --- */
 
       execl(PREFIX "/share/sw-precommit", "sw-precommit",

-           sw.package, (void *)0);
+           sw.package, (char *)0);

       if (errno == ENOENT)
        _exit(0);
       die(1, "couldn't run " PREFIX "/share/sw-precommit: %s",
       if (errno == ENOENT)
        _exit(0);
       die(1, "couldn't run " PREFIX "/share/sw-precommit: %s",