Changeset 302 for trunk

Timestamp:

Nov 9, 2010, 8:20:52 PM (14 years ago)

Author:

katerina

Message:

Fix for ticket #224 (make install doesn't create user-defined tmp directory).

Location:

trunk

Files:

• Makefile.in (modified) (5 diffs)
• configure.ac (modified) (2 diffs)

trunk/Makefile.in

@@ -39 +39 @@
 mandir = @mandir@
 datarootdir = @datarootdir@
+mytmpdir = @mytmpdir@
 
 configfile = @myconffile@
@@ -530 +531 @@
 install-program: $(PROGRAMS) sstrip
         @$(mkinstalldirs) $(DESTDIR)$(sbindir)
+        @if test x$(mytmpdir) != x; then \
+                $(mkinstalldirs) $(DESTDIR)$(mytmpdir); \
+        fi
         @list='$(PROGRAMS)'; for p in $$list; do \
           if test -f $$p; then \
@@ -677 +681 @@
         rm -f $$STAGE/@sbindir@/@install_name@_stealth; \
         echo "#! /bin/sh"                        > $$STAGE/setup.sh; \
+        if test x$(mytmpdir) != x; then \
+        echo  "./mkinstalldirs @mytmpdir@ || exit 1"    >> $$STAGE/setup.sh; \
+        fi; \
         echo  "./mkinstalldirs @sbindir@ || exit 1"     >> $$STAGE/setup.sh; \
         echo  "./mkinstalldirs @sysconfdir@ || exit 1"  >> $$STAGE/setup.sh; \
@@ -794 +801 @@
         chmod +x debian/rules; \
         echo $(sbindir)     | sed s,^/,,  > debian/dirs; \
+        if test x$(mytmpdir) != x; then \
+        echo $(mytmpdir)    | sed s,^/,, >> debian/dirs; \
+        fi; \
         echo $(sysconfdir)  | sed s,^/,, >> debian/dirs; \
         echo etc/init.d                  >> debian/dirs; \
@@ -817 +827 @@
         chmod +x debian/rules; \
         echo $(sbindir)     | sed s,^/,,  > debian/dirs; \
+        if test x$(mytmpdir) != x; then \
+        echo $(mytmpdir)    | sed s,^/,, >> debian/dirs; \
+        fi; \
         echo $(sysconfdir)  | sed s,^/,, >> debian/dirs; \
         echo etc/init.d                  >> debian/dirs; \

trunk/configure.ac

@@ -2465 +2465 @@
 AC_SUBST(mytrust)
 
+mytmpdir=
+
 AC_ARG_WITH(tmp-dir,
         [  --with-tmp-dir=PFX           set directory for temporary files [[HOME]]],
         [
         if test "x${cross_compiling}" = xyes; then
-                my_tmp_dir="$withval"
-                AC_DEFINE_UNQUOTED(SH_TMPDIR, _("${my_tmp_dir}") )
+                mytmpdir="$withval"
+                AC_DEFINE_UNQUOTED(SH_TMPDIR, _("${mytmpdir}") )
         else
                 if test -d "${withval}"; then
-                        my_tmp_dir="$withval"
-                        AC_DEFINE_UNQUOTED(SH_TMPDIR, _("${my_tmp_dir}") )
+                        mytmpdir="$withval"
+                        AC_DEFINE_UNQUOTED(SH_TMPDIR, _("${mytmpdir}") )
                 else
-                        my_tmp_dir="$withval"
-                        AC_DEFINE_UNQUOTED(SH_TMPDIR, _("${my_tmp_dir}") )
+                        mytmpdir="$withval"
+                        AC_DEFINE_UNQUOTED(SH_TMPDIR, _("${mytmpdir}") )
                         AC_MSG_WARN([--with-tmp-dir: tmp directory ${withval} does not exist])
                 fi
@@ -2483 +2485 @@
         ]
 )
+
+AC_SUBST(mytmpdir)
+
 
 dnl