Changeset 182 in MondoRescue for branches/2.05/mondo/mondo

Timestamp:

Dec 13, 2005, 2:17:16 AM (18 years ago)

Author:

bcornec

Message:

disable x11 build by default
g_mondo_home is now computed at compile time with a define

Location:

branches/2.05/mondo/mondo/common

Files:

• Makefile.am (modified) (2 diffs)
• libmondo-tools.c (modified) (1 diff)

branches/2.05/mondo/mondo/common/Makefile.am

@@ -3 +3 @@
 ##
 
+AM_CPPFLAGS = -DMONDO_LIB=\"$(pkglibdir)\"
 ## Headers
+
 noinst_HEADERS       = libmondo-archive.h libmondo-devices.h \
                        libmondo-filelist.h libmondo-files.h libmondo-fork.h \
@@ -27 +29 @@
                        libmondo-mountlist.c libmondo-raid.c \
                        libmondo-stream.c libmondo-string.c libmondo-tools.c \
-                       libmondo-verify.c 
+                       libmondo-verify.c
 libmondo_la_LDFLAGS  = -version-info 2:3:0 -shrext .so
 libmondo_la_LIBADD   = @LIBS@

branches/2.05/mondo/mondo/common/libmondo-tools.c

@@ -352 +352 @@
 {
     assert(home_sz != NULL);
-    strcpy(home_sz,
-           call_program_and_get_last_line_of_output
-           ("find /usr/lib/ /usr/local/ /usr/share/ /usr/local/share/ /opt/ /ramdisk/usr/share/ -type d -maxdepth 2 -name include -prune -o -type d -maxdepth 2 -path '*/mondo/restore-scripts' -printf '%h\n' 2> /dev/null"));
-
-    if (home_sz[0] == '\0') {
-        strcpy(home_sz,
-               call_program_and_get_last_line_of_output
-               ("find /usr -type d -path '*/mondo/restore-scripts' -follow -maxdepth 3 -printf '%h\n' 2> /dev/null"));
-    }
-    if (home_sz[0] == '\0') {
-        return (1);
-    } else {
-        return (0);
-    }
+    strcpy(home_sz, MONDO_LIB);
+    return (0);
 }