Changeset 1043

Timestamp:

05/14/08 16:47:21 (4 years ago)

Author:

alonbl

Message:

Fixup etc substitutions

Location:

trunk

Files:

• configure.ac (modified) (3 diffs)
• etc/Makefile.am (modified) (1 diff)
• etc/init-script.in (modified) (5 diffs)
• etc/openct.conf.in (modified) (2 diffs)
• etc/openct.hald.in (modified) (1 diff)
• etc/openct.udev.in (moved) (moved from trunk/etc/openct.udev) (2 diffs)
• etc/openct.udev.modalias.in (moved) (moved from trunk/etc/openct.udev.modalias) (2 diffs)
• etc/openct_pcmcia.in (modified) (1 diff)
• etc/openct_serial.in (modified) (1 diff)
• etc/openct_usb.in (modified) (2 diffs)
• etc/openct_usb.mdev.in (modified) (1 diff)
• etc/reader.conf.in (modified) (1 diff)

trunk/configure.ac

@@ -71 +71 @@
 esac
 
-rootlibdir="/lib${libdir##*/lib}"
 usrlibdir="/usr/lib${libdir##*/lib}"
 usrsbindir="/usr/sbin${libdir##*/sbin}"
@@ -367 +366 @@
 AC_DEFINE_UNQUOTED([OPENCT_CONF_PATH], ["${full_sysconfdir}/openct.conf"], [default config file for libopenct])
 AC_DEFINE_UNQUOTED([OPENCT_MODULES_PATH], ["${ifddir}"], [modules path for libopenct])
-AC_DEFINE_UNQUOTED([OPENCT_SOCKET_PATH], ["${full_localstatedir}/run/openct"], [socket path for libopenct])
+OPENCT_SOCKET_PATH="${full_localstatedir}/run/openct"
+AC_DEFINE_UNQUOTED([OPENCT_SOCKET_PATH], ["${OPENCT_SOCKET_PATH}"], [socket path for libopenct])
 AC_DEFINE_UNQUOTED([OPENCT_IFDHANDLER_PATH], ["${usrsbindir}/ifdhandler"], [ifdhandler path for libopenct])
 
@@ -399 +399 @@
 AC_SUBST([OPTIONAL_LIBUSB_CFLAGS])
 AC_SUBST([OPTIONAL_LIBUSB_LIBS])
+AC_SUBST([OPENCT_SOCKET_PATH])
 
 AM_CONDITIONAL([SVN_CHECKOUT], [test "${svn_checkout}" = "yes"])

trunk/etc/Makefile.am

@@ -33 +33 @@
 
 .in:
-        $(SED) -e "s#SBINDIR#$(sbindir)#g" -e "s#LIBDIR#$(libdir)#g" < "$^" > "$@"
+        sed \
+                -e 's|@bindir[@]|$(bindir)|g' \
+                -e 's|@sbindir[@]|$(sbindir)|g' \
+                -e 's|@libdir[@]|$(libdir)|g' \
+                -e 's|@udevdir[@]|$(udevdir)|g' \
+                -e 's|@localstatedir[@]|$(localstatedir)|g' \
+                -e 's|@OPENCT_SOCKET_PATH[@]|$(OPENCT_SOCKET_PATH)|g' \
+                < "$<" > "$@"

trunk/etc/init-script.in

@@ -3 +3 @@
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=SBINDIR/openct-control
+DAEMON=@sbindir@/openct-control
 NAME=OpenCT
 DESC="smart card terminal framework"
@@ -11 +11 @@
 # create the directory for our status and socket files,
 # if it does not exist.
-if ! test -e /var/run/openct
+if ! test -e "@OPENCT_SOCKET_PATH@"
 then
-        mkdir /var/run/openct
+        mkdir "@OPENCT_SOCKET_PATH@"
 
         # maybe you also want to set owner ship and permissions here.
@@ -19 +19 @@
         # and set permissions so only users in that group can access
         # smart card readers via openct.
-        #chown root:scard /var/run/openct
-        #chmod 0750 /var/run/openct
+        #chown root:scard "@OPENCT_SOCKET_PATH@"
+        #chmod 0750 "@OPENCT_SOCKET_PATH@"
 fi
 
@@ -34 +34 @@
         echo -n "Stopping $DESC: $NAME "
         $DAEMON shutdown
-        rm /var/run/openct/status
+        rm "@OPENCT_SOCKET_PATH@/status"
         echo "."
         ;;
@@ -47 +47 @@
         # echo -n "Reloading $DESC configuration..."
         # start-stop-daemon --stop --signal 1 --quiet --pidfile \
-        #       /var/run/$NAME.pid --exec $DAEMON
+        #       @localstatedir@/run/$NAME.pid --exec $DAEMON
         # echo "done."
   #;;

trunk/etc/openct.conf.in

@@ -8 +8 @@
 # Path to ifdhandler
 ifdhandler {
-        program         = SBINDIR/ifdhandler;
+        program         = @sbindir@/ifdhandler;
 #       user            = openctd;
 #       groups = {
@@ -18 +18 @@
 # Configuration for ifdproxy (if you use it)
 ifdproxy {
-#       server-port     = /var/run/openct/.ifdproxy,
+#       server-port     = @OPENCT_SOCKET_PATH@/.ifdproxy,
 #       device-port     = :6666;
 };

trunk/etc/openct.hald.in

@@ -9 +9 @@
 if test -e $DEVICE
 then
-        exec SBINDIR/openct-control attach usb:$PRODUCT usb $DEVICE
+        exec @sbindir@/openct-control attach usb:$PRODUCT usb $DEVICE
 fi
 
 DEVICE="`printf /proc/bus/usb/%03u/%03u \
         $HAL_PROP_USB_BUS_NUMBER $HAL_PROP_USB_LINUX_DEVICE_NUMBER`"
-exec SBINDIR/openct-control attach usb:$PRODUCT usb $DEVICE
+exec @sbindir@/openct-control attach usb:$PRODUCT usb $DEVICE

trunk/etc/openct.udev.in

@@ -28 +28 @@
 
 # egate
-SYSFS{idVendor}=="0973", SYSFS{idProduct}=="0001", RUN+="/lib/udev/openct_usb"
+SYSFS{idVendor}=="0973", SYSFS{idProduct}=="0001", RUN+="@udevdir@/openct_usb"
 # eToken
-SYSFS{idVendor}=="0529", SYSFS{idProduct}=="050c", RUN+="/lib/udev/openct_usb"
-SYSFS{idVendor}=="0529", SYSFS{idProduct}=="0514", RUN+="/lib/udev/openct_usb"
+SYSFS{idVendor}=="0529", SYSFS{idProduct}=="050c", RUN+="@udevdir@/openct_usb"
+SYSFS{idVendor}=="0529", SYSFS{idProduct}=="0514", RUN+="@udevdir@/openct_usb"
 # eToken 64
-SYSFS{idVendor}=="0529", SYSFS{idProduct}=="0600", RUN+="/lib/udev/openct_usb"
-SYSFS{idVendor}=="0529", SYSFS{idProduct}=="0700", RUN+="/lib/udev/openct_usb"
+SYSFS{idVendor}=="0529", SYSFS{idProduct}=="0600", RUN+="@udevdir@/openct_usb"
+SYSFS{idVendor}=="0529", SYSFS{idProduct}=="0700", RUN+="@udevdir@/openct_usb"
 # eutron
-SYSFS{idVendor}=="073d", SYSFS{idProduct}=="0005", RUN+="/lib/udev/openct_usb"
+SYSFS{idVendor}=="073d", SYSFS{idProduct}=="0005", RUN+="@udevdir@/openct_usb"
 # ikey2k
-SYSFS{idVendor}=="04b9", SYSFS{idProduct}=="1200", RUN+="/lib/udev/openct_usb"
+SYSFS{idVendor}=="04b9", SYSFS{idProduct}=="1200", RUN+="@udevdir@/openct_usb"
 # ikey3k
-SYSFS{idVendor}=="04b9", SYSFS{idProduct}=="1300", RUN+="/lib/udev/openct_usb"
+SYSFS{idVendor}=="04b9", SYSFS{idProduct}=="1300", RUN+="@udevdir@/openct_usb"
 # starkey
-SYSFS{idVendor}=="096e", SYSFS{idProduct}=="0005", RUN+="/lib/udev/openct_usb"
+SYSFS{idVendor}=="096e", SYSFS{idProduct}=="0005", RUN+="@udevdir@/openct_usb"
 # cardman
-#SYSFS{idVendor}=="076b", SYSFS{idProduct}=="0596", RUN+="/lib/udev/openct_usb"
-#SYSFS{idVendor}=="076b", SYSFS{idProduct}=="1784", RUN+="/lib/udev/openct_usb"
-#SYSFS{idVendor}=="08d4", SYSFS{idProduct}=="0009", RUN+="/lib/udev/openct_usb"
+#SYSFS{idVendor}=="076b", SYSFS{idProduct}=="0596", RUN+="@udevdir@/openct_usb"
+#SYSFS{idVendor}=="076b", SYSFS{idProduct}=="1784", RUN+="@udevdir@/openct_usb"
+#SYSFS{idVendor}=="08d4", SYSFS{idProduct}=="0009", RUN+="@udevdir@/openct_usb"
 
 # ccid
-SYSFS{bInterfaceClass}=="0b", SYSFS{bInterfaceSubClass}=="00", SYSFS{bInterfaceProtocol}=="00" RUN+="/lib/udev/openct_usb"
+SYSFS{bInterfaceClass}=="0b", SYSFS{bInterfaceSubClass}=="00", SYSFS{bInterfaceProtocol}=="00" RUN+="@udevdir@/openct_usb"
 
 # spr 532 - ccid, but with wrong interface class (vendor) :(
-SYSFS{idVendor}=="04e6", SYSFS{idProduct}=="0003", RUN+="/lib/udev/openct_usb"
+SYSFS{idVendor}=="04e6", SYSFS{idProduct}=="0003", RUN+="@udevdir@/openct_usb"
 # pertosmart1030
-SYSFS{idVendor}=="072f", SYSFS{idProduct}=="0001", RUN+="/lib/udev/openct_usb"
-SYSFS{idVendor}=="072f", SYSFS{idProduct}=="8009", RUN+="/lib/udev/openct_usb"
+SYSFS{idVendor}=="072f", SYSFS{idProduct}=="0001", RUN+="@udevdir@/openct_usb"
+SYSFS{idVendor}=="072f", SYSFS{idProduct}=="8009", RUN+="@udevdir@/openct_usb"
 # pertosmart1038
-SYSFS{idVendor}=="072f", SYSFS{idProduct}=="9000", RUN+="/lib/udev/openct_usb"
-SYSFS{idVendor}=="072f", SYSFS{idProduct}=="90d0", RUN+="/lib/udev/openct_usb"
+SYSFS{idVendor}=="072f", SYSFS{idProduct}=="9000", RUN+="@udevdir@/openct_usb"
+SYSFS{idVendor}=="072f", SYSFS{idProduct}=="90d0", RUN+="@udevdir@/openct_usb"
 # wbeiuu        - driver not working yet.
-#SYSFS{idVendor}=="104f", SYSFS{idProduct}=="0004", RUN+="/lib/udev/openct_usb"
+#SYSFS{idVendor}=="104f", SYSFS{idProduct}=="0004", RUN+="@udevdir@/openct_usb"
 # cyberjack
-SYSFS{idVendor}=="0c4b", SYSFS{idProduct}=="0100", RUN+="/lib/udev/openct_usb"
+SYSFS{idVendor}=="0c4b", SYSFS{idProduct}=="0100", RUN+="@udevdir@/openct_usb"
 # rutoken
-SYSFS{idVendor}=="0a89", SYSFS{idProduct}=="0020", RUN+="/lib/udev/openct_usb"
+SYSFS{idVendor}=="0a89", SYSFS{idProduct}=="0020", RUN+="@udevdir@/openct_usb"
 
 LABEL="openct_usb_rules_end"
@@ -74 +74 @@
 
 # omnikey cardman 4040
-SUBSYSTEM=="cardman_4040", RUN+="/lib/udev/openct_pcmcia"
+SUBSYSTEM=="cardman_4040", RUN+="@udevdir@/openct_pcmcia"
 
 # Gemplus PCMCIA Card
-DRIVERS=="serial_cs", SYSFS{prod_id1}=="Gemplus", SYSFS{prod_id2}=="SerialPort", SYSFS{prod_id3}=="GemPC Card", RUN+="/lib/udev/openct_serial"
+DRIVERS=="serial_cs", SYSFS{prod_id1}=="Gemplus", SYSFS{prod_id2}=="SerialPort", SYSFS{prod_id3}=="GemPC Card", RUN+="@udevdir@/openct_serial"
 
 LABEL="openct_pcmcia_rules_end"

trunk/etc/openct.udev.modalias.in

@@ -22 +22 @@
 
 # egate
-ENV{MODALIAS}=="usb:v0973p0001*", RUN+="/lib/udev/openct_usb"
+ENV{MODALIAS}=="usb:v0973p0001*", RUN+="@udevdir@/openct_usb"
 # eToken
-ENV{MODALIAS}=="usb:v0529p050C*", RUN+="/lib/udev/openct_usb"
-ENV{MODALIAS}=="usb:v0529p0514", RUN+="/lib/udev/openct_usb"
+ENV{MODALIAS}=="usb:v0529p050C*", RUN+="@udevdir@/openct_usb"
+ENV{MODALIAS}=="usb:v0529p0514", RUN+="@udevdir@/openct_usb"
 # eToken 64
-ENV{MODALIAS}=="usb:v0529p0600*", RUN+="/lib/udev/openct_usb"
-ENV{MODALIAS}=="usb:v0529p0700*", RUN+="/lib/udev/openct_usb"
+ENV{MODALIAS}=="usb:v0529p0600*", RUN+="@udevdir@/openct_usb"
+ENV{MODALIAS}=="usb:v0529p0700*", RUN+="@udevdir@/openct_usb"
 # eutron
-ENV{MODALIAS}=="usb:v073Dp0005*", RUN+="/lib/udev/openct_usb"
+ENV{MODALIAS}=="usb:v073Dp0005*", RUN+="@udevdir@/openct_usb"
 # ikey2k
-ENV{MODALIAS}=="usb:v04B9p1200*", RUN+="/lib/udev/openct_usb"
+ENV{MODALIAS}=="usb:v04B9p1200*", RUN+="@udevdir@/openct_usb"
 # ikey3k
-ENV{MODALIAS}=="usb:v04B9p1300*", RUN+="/lib/udev/openct_usb"
+ENV{MODALIAS}=="usb:v04B9p1300*", RUN+="@udevdir@/openct_usb"
 # starkey
-ENV{MODALIAS}=="usb:v096Ep0005*", RUN+="/lib/udev/openct_usb"
+ENV{MODALIAS}=="usb:v096Ep0005*", RUN+="@udevdir@/openct_usb"
 # cardman
-#ENV{MODALIAS}=="usb:v076Bp0596*", RUN+="/lib/udev/openct_usb"
-#ENV{MODALIAS}=="usb:v076Bp1784*", RUN+="/lib/udev/openct_usb"
-#ENV{MODALIAS}=="usb:v08D4p0009*", RUN+="/lib/udev/openct_usb"
+#ENV{MODALIAS}=="usb:v076Bp0596*", RUN+="@udevdir@/openct_usb"
+#ENV{MODALIAS}=="usb:v076Bp1784*", RUN+="@udevdir@/openct_usb"
+#ENV{MODALIAS}=="usb:v08D4p0009*", RUN+="@udevdir@/openct_usb"
 
 # ccid
-ENV{MODALIAS}=="usb:*ic0Bisc00*", RUN+="/lib/udev/openct_usb"
+ENV{MODALIAS}=="usb:*ic0Bisc00*", RUN+="@udevdir@/openct_usb"
 
 # spr 532 - ccid, but with wrong interface class (vendor) :(
-ENV{MODALIAS}=="usb:v04E6p0003*", RUN+="/lib/udev/openct_usb"
+ENV{MODALIAS}=="usb:v04E6p0003*", RUN+="@udevdir@/openct_usb"
 # pertosmart1030
-ENV{MODALIAS}=="usb:v072Fp0001*", RUN+="/lib/udev/openct_usb"
-ENV{MODALIAS}=="usb:v072Fp8009*", RUN+="/lib/udev/openct_usb"
+ENV{MODALIAS}=="usb:v072Fp0001*", RUN+="@udevdir@/openct_usb"
+ENV{MODALIAS}=="usb:v072Fp8009*", RUN+="@udevdir@/openct_usb"
 # pertosmart1038
-ENV{MODALIAS}=="usb:v072Fp9000*", RUN+="/lib/udev/openct_usb"
-ENV{MODALIAS}=="usb:v072Fp90D0*", RUN+="/lib/udev/openct_usb"
+ENV{MODALIAS}=="usb:v072Fp9000*", RUN+="@udevdir@/openct_usb"
+ENV{MODALIAS}=="usb:v072Fp90D0*", RUN+="@udevdir@/openct_usb"
 # wbeiuu - driver not working yet
-#ENV{MODALIAS}=="usb:v104Fp0004*", RUN+="/lib/udev/openct_usb"
+#ENV{MODALIAS}=="usb:v104Fp0004*", RUN+="@udevdir@/openct_usb"
 
 LABEL="openct_usb_rules_end"
@@ -64 +64 @@
 
 # omnikey cardman 4040
-SUBSYSTEM=="cardman_4040", RUN+="/lib/udev/openct_pcmcia"
+SUBSYSTEM=="cardman_4040", RUN+="@udevdir@/openct_pcmcia"
 
 # Gemplus PCMCIA Card
-DRIVERS=="serial_cs", SYSFS{prod_id1}=="Gemplus", SYSFS{prod_id2}=="SerialPort", SYSFS{prod_id3}=="GemPC Card", RUN+="/lib/udev/openct_serial"
+DRIVERS=="serial_cs", SYSFS{prod_id1}=="Gemplus", SYSFS{prod_id2}=="SerialPort", SYSFS{prod_id3}=="GemPC Card", RUN+="@udevdir@/openct_serial"
 
 LABEL="openct_pcmcia_rules_end"

trunk/etc/openct_pcmcia.in

@@ -3 +3 @@
 test "$ACTION" = "add" || exit 0
 test -n "$DEVNAME" || exit 0 
-test -e /var/run/openct/status || exit 0
+test -e "@OPENCT_SOCKET_PATH@/status" || exit 0
 
 if [ -n "$DEVNAME" ]
 then
-        SBINDIR/openct-control attach ccid pcmcia_block $DEVNAME
+        @sbindir@/openct-control attach ccid pcmcia_block $DEVNAME
         exit 0
 fi

trunk/etc/openct_serial.in

@@ -3 +3 @@
 test "$ACTION" = "add" || exit 0
 test -n "$DEVNAME" || exit 0 
-test -e /var/run/openct/status || exit 0
+test -e "@OPENCT_SOCKET_PATH@/status" || exit 0
 
 if [ -n "$DEVNAME" ]
 then
-        SBINDIR/openct-control attach ccid serial $DEVNAME
+        @sbindir@/openct-control attach ccid serial $DEVNAME
         exit 0
 fi

trunk/etc/openct_usb.in

@@ -3 +3 @@
 [ -n "$DEVPATH" ] || exit 0
 [ "$ACTION" = "add" ] || exit 0
-[ -e /var/run/openct/status ] || exit 0
+[ -e "@OPENCT_SOCKET_PATH@/status" ] || exit 0
 
 # try to get the device node from the parent device
@@ -34 +34 @@
 for A in "0 1 2 3 4 5 6 7 8 9"; do
         if [ -e "$DEVICE" ]; then
-                SBINDIR/openct-control attach usb:$PRODUCT usb $DEVICE
+                @sbindir@/openct-control attach usb:$PRODUCT usb $DEVICE
                 exit 0
         fi

trunk/etc/openct_usb.mdev.in

@@ -19 +19 @@
 fi
 
-[ -e /var/run/openct/status ] || exit 0
+[ -e "@OPENCT_SOCKET_PATH@/status" ] || exit 0
 
 # Don't know why...
 sleep 1
 
-SBINDIR/openct-control attach "usb:${PRODUCT}" usb "${DEVICE}"
+@sbindir@/openct-control attach "usb:${PRODUCT}" usb "${DEVICE}"

trunk/etc/reader.conf.in

@@ -4 +4 @@
 FRIENDLYNAME     "OpenCT"
 DEVICENAME       /dev/null 
-LIBPATH          LIBDIR/openct-ifd.so
+LIBPATH          @libdir@/openct-ifd.so
 CHANNELID        0