Changeset 104 for server/common/oursrc/execsys

Timestamp:

Jan 20, 2007, 10:52:04 PM (18 years ago)

Author:

presbrey

Message:

upd-execsys bug fix
renamed staticsys-cat from sbin to bin to avoid selinux

Location:

server/common/oursrc/execsys

Files:

• Makefile.in (modified) (1 diff)
• configure.in (modified) (1 diff)
• mrproper (modified) (1 diff)
• static-cat.c.pre (moved) (moved from server/common/oursrc/execsys/staticsys-cat.c.pre) (1 diff)
• upd-execsys (modified) (1 diff)

server/common/oursrc/execsys/Makefile.in

@@ -6 +6 @@
 sysconfdir = @sysconfdir@
 APACHEDIR = /etc/httpd
-SYSCATPATH = /usr/local/sbin
+SYSCATPATH = /usr/local/bin
 
-all-local: staticsys-cat execsys-binfmt
+all-local: static-cat execsys-binfmt
 
-staticsys-cat.c execsys-binfmt: staticsys-cat.c.pre execsys-binfmt.pre
-        @UPD_VARS@ syscat_path=$(SYSCATPATH) perl upd-execsys
+static-cat.c execsys-binfmt: static-cat.c.pre execsys-binfmt.pre
+        @UPD_VARS@ syscat_path=$(SYSCATPATH)/static-cat perl upd-execsys
 
 install: all-local
         install -D -p -m644 execsys.conf $(DESTDIR)$(APACHEDIR)/conf.d/execsys.conf
         install -D -p -m755 execsys-binfmt $(DESTDIR)/etc/init.d/execsys-binfmt
-        install -D -p -m755 staticsys-cat $(DESTDIR)$(SYSCATPATH)/staticsys-cat
+        install -D -p -m755 static-cat $(DESTDIR)$(SYSCATPATH)/static-cat
 
 clean:
-        rm -f staticsys-cat
+        rm -f static-cat
 
 distclean: clean

server/common/oursrc/execsys/configure.in

@@ -1 @@
-AC_INIT(staticsys-cat.c.pre)
+AC_INIT(static-cat.c.pre)
 
 AC_PROG_CC

server/common/oursrc/execsys/mrproper

@@ -1 +1 @@
 #!/bin/sh
 
-rm -f staticsys-cat
+rm -f static-cat
 rm -f configure config.* Makefile
 rm -rf auto*.cache

server/common/oursrc/execsys/static-cat.c.pre

@@ -1 +1 @@
 /*
- * staticsys-cat
+ * static-cat
  * Copyright (C) 2006  Jeff Arnold <jbarnold@mit.edu>
  * 

server/common/oursrc/execsys/upd-execsys

@@ -107 +107 @@
 close(CONF);
 
-open(CAT, "./staticsys-cat.c.pre");
+open(CAT, "./static-cat.c.pre");
 $file = <CAT>;
 ($fstart, $fend) = ($file =~ /$regexp/s);
 close(CAT);
 
-open(CAT, ">./staticsys-cat.c");
+open(CAT, ">./static-cat.c");
 print CAT $fstart, "\n";
 print CAT '#define NEXTS ', scalar(@static), "\n";