From ff90bacf805e4f9ec376b377ccdf269a5ee1530a Mon Sep 17 00:00:00 2001 From: dsandersoremutah Date: Fri, 3 Feb 2006 20:00:50 +0000 Subject: [PATCH] Renamed gprintf.exe to printf.exe and gmake.exe to make.exe. Added these to the distro. Made some changes for the pkg-config - added Cflags and includedir git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@59 0109f412-320b-0410-ab79-c3e0c5ffbbe6 --- xflaim/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xflaim/Makefile b/xflaim/Makefile index 4bf2e99..ea5357d 100644 --- a/xflaim/Makefile +++ b/xflaim/Makefile @@ -392,11 +392,7 @@ libr = linker = compiler = -ifdef unix_target - gprintf = printf -else - gprintf = gprintf -endif +gprintf = printf # Compiler definitions and flags @@ -1068,6 +1064,8 @@ ifndef win_target $(ec)$(call mkdircmd,$(package_dir)/$(rpm_proj_name_and_ver)) $(ec)$(gprintf) "$(version)" > $(package_dir)/$(rpm_proj_name_and_ver)/VERSION $(ec)$(gprintf) " " > $(package_dir)/$(rpm_proj_name_and_ver)/SVNRevision.$(revision) + $(ec)$(call copycmd,make.exe,$(package_dir)/$(rpm_proj_name_and_ver)) + $(ec)$(call copycmd,printf.exe,$(package_dir)/$(rpm_proj_name_and_ver)) $(ec)$(call copycmd,Makefile,$(package_dir)/$(rpm_proj_name_and_ver)) $(ec)$(call copycmd,COPYING,$(package_dir)/$(rpm_proj_name_and_ver)) $(ec)$(call copycmd,Doxyfile,$(package_dir)/$(rpm_proj_name_and_ver)) @@ -1178,10 +1176,12 @@ pkgconfig: dircheck $(ec)$(gprintf) "prefix=$(install_prefix)\n" > $(pkgconfig_file) $(ec)$(gprintf) "exec_prefix=$$""{prefix}\n" >> $(pkgconfig_file) $(ec)$(gprintf) "libdir=$$""{exec_prefix}/$(lib_dir_name)\n" >> $(pkgconfig_file) - $(ec)$(gprintf) "name: $(rpm_proj_name)\n" >> $(pkgconfig_file) + $(ec)$(gprintf) "includedir=$$""{prefix}/include\n\n" >> $(pkgconfig_file) + $(ec)$(gprintf) "Name: $(rpm_proj_name)\n" >> $(pkgconfig_file) $(ec)$(gprintf) "Description: $(project_desc)\n" >> $(pkgconfig_file) $(ec)$(gprintf) "Version: $(version)\n" >> $(pkgconfig_file) $(ec)$(gprintf) "Libs: $(lib_link_libs) -lxflaim -L$$""{libdir}\n" >> $(pkgconfig_file) + $(ec)$(gprintf) "Cflags: -I$$""{includedir}\n" >> $(pkgconfig_file) # -- SRCRPM --