FLAIM change. Misc. Makefile changes.

git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@858 0109f412-320b-0410-ab79-c3e0c5ffbbe6

flaim/Makefile

@@ -313,7 +313,9 @@ endif
 
 ifeq (,$(HOSTTYPE))
 	ifneq ($(host_os_family),hpux)
-		HOSTTYPE := $(shell uname -p)
+		ifneq ($(host_os_family),linux)
+			HOSTTYPE := $(shell uname -p)
+		endif
 	endif
 	ifeq (,$(HOSTTYPE))
 		HOSTTYPE := $(shell uname -m)
@@ -1717,7 +1719,7 @@ srcdist: status clean dircheck docs spec
 	$(ec)$(call copycmd,COPYING,$(package_stage_dir))
 	$(ec)$(call dircopycmd,docs,$(package_stage_dir)/docs)
 	$(ec)$(call dircopycmd,src,$(package_stage_dir)/src)
-	$(ec)$(call copycmd,$(dir $(topdir))ftk/src/ftk.h,$(package_stage_dir)/src/flaimtk.h)
+	$(ec)$(call copycmd,$(ftk_src_dir)/ftk.h,$(package_stage_dir)/src/flaimtk.h)
 	$(ec)$(call dircopycmd,util,$(package_stage_dir)/util)
 	$(ec)$(call dircopycmd,sample,$(package_stage_dir)/sample)
 	$(ec)$(call dircopycmd,$(doxygen_output_dir),$(package_stage_dir)/docs)
@@ -1819,8 +1821,8 @@ ifneq ($(host_os_family),win)
 	install --mode=644 $(flaim_static_lib) $(lib_install_dir)
 	install --mode=644 $(pkgconfig_file) $(pkgconfig_install_dir)
 	install --mode=644 src/flaim.h $(include_install_dir)
-	install --mode=644 src/flaimtk.h $(include_install_dir)
-	-ldconfig $(lib_install_dir) -l -v $(lib_install_dir)/$(lib_prefix)$(project_name)$(shared_lib_suffix)
+	install --mode=644 $(ftk_src_dir)/ftk.h $(include_install_dir)/flaimtk.h
+	ldconfig $(lib_install_dir)
 	$(ec)$(gprintf) "Installation complete.\n"
 endif
 

flaim/src/flaim.h

@@ -1492,6 +1492,7 @@
 
 	#define FLM_RECID_FIELD		FLM_DRN_TAG
 	#define FLM_ANY_FIELD		FLM_WILD_TAG
+	#define FLM_WILD				FLM_WILD_TAG
 
 	/// Add a field path to the query criteria.
 	/// \ingroup querydef