mars_nwe/mars-flaim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modified to use $(dollar) and $(percent)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@60 0109f412-320b-0410-ab79-c3e0c5ffbbe6
This commit is contained in:
dsandersoremutah
2006-02-03 20:08:40 +00:00
parent ff90bacf80
commit 1a4ebe2169
2 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
flaim/Makefile
View File

@@ -895,12 +895,12 @@ pkgconfig: dircheck
$(ec)$(gprintf) "prefix=$(install_prefix)\n" > $(pkgconfig_file)
$(ec)$(gprintf) "exec_prefix=$(dollar){prefix}\n" >> $(pkgconfig_file)
$(ec)$(gprintf) "libdir=$(dollar){exec_prefix}/$(lib_dir_name)\n" >> $(pkgconfig_file)
$(ec)$(gprintf) "includedir=$$""{prefix}/include\n\n" >> $(pkgconfig_file)
$(ec)$(gprintf) "includedir=$(dollar){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) -lflaim -L$(dollar){libdir}\n" >> $(pkgconfig_file)
$(ec)$(gprintf) "Cflags: -I$$""{includedir}\n" >> $(pkgconfig_file)
$(ec)$(gprintf) "Cflags: -I$(dollar){includedir}\n" >> $(pkgconfig_file)
# -- SRCRPM --

59
xflaim/Makefile
View File

@@ -368,7 +368,8 @@ static_lib_dir = $(target_path)/lib/static
em :=
sp := $(em) $(em)
comma := ,
percent := \045
dollar := \044
ifeq ($(host_os_family),win)
allprereqs = $(subst /,\,$+)
@@ -1120,7 +1121,7 @@ endif
spec: dircheck
$(ec)$(gprintf) "# neededforbuild libstdc++-devel libstdc++ gcc-c++\n" > $(spec_file)
$(ec)$(gprintf) "\n" >> $(spec_file)
$(ec)$(gprintf) "%%define prefix $(install_prefix)\n" >> $(spec_file)
$(ec)$(gprintf) "$(percent)define prefix $(install_prefix)\n" >> $(spec_file)
$(ec)$(gprintf) "\n" >> $(spec_file)
$(ec)$(gprintf) "BuildRequires: libstdc++-devel libstdc++ gcc-c++\n" >> $(spec_file)
$(ec)$(gprintf) "Summary: $(project_desc)\n" >> $(spec_file)
@@ -1133,55 +1134,55 @@ spec: dircheck
$(ec)$(gprintf) "Source: $(rpm_proj_name_and_ver).tar.gz\n" >> $(spec_file)
$(ec)$(gprintf) "BuildRoot: /var/tmp/$(rpm_proj_name_and_ver)-buildroot\n" >> $(spec_file)
$(ec)$(gprintf) "\n" >> $(spec_file)
$(ec)$(gprintf) "%%description\n" >> $(spec_file)
$(ec)$(gprintf) "$(percent)description\n" >> $(spec_file)
$(ec)$(gprintf) "\n" >> $(spec_file)
$(ec)$(gprintf) "%%package devel\n" >> $(spec_file)
$(ec)$(gprintf) "$(percent)package devel\n" >> $(spec_file)
$(ec)$(gprintf) "Summary: XFLAIM static library and header file\n" >> $(spec_file)
$(ec)$(gprintf) "Group: Development/Libraries/C and C++\n" >> $(spec_file)
$(ec)$(gprintf) "Provides: $(rpm_proj_name)-devel\n" >> $(spec_file)
$(ec)$(gprintf) "\n" >> $(spec_file)
$(ec)$(gprintf) "%%description devel\n" >> $(spec_file)
$(ec)$(gprintf) "$(percent)description devel\n" >> $(spec_file)
$(ec)$(gprintf) "\n" >> $(spec_file)
$(ec)$(gprintf) "%%prep\n" >> $(spec_file)
$(ec)$(gprintf) "$(percent)prep\n" >> $(spec_file)
$(ec)$(gprintf) "\n" >> $(spec_file)
$(ec)$(gprintf) "%%setup -q\n" >> $(spec_file)
$(ec)$(gprintf) "$(percent)setup -q\n" >> $(spec_file)
$(ec)$(gprintf) "\n" >> $(spec_file)
$(ec)$(gprintf) "%%build\n" >> $(spec_file)
$(ec)$(gprintf) "make lib_dir_name=%%{_lib} libs\n" >> $(spec_file)
$(ec)$(gprintf) "$(percent)build\n" >> $(spec_file)
$(ec)$(gprintf) "make lib_dir_name=$(percent){_lib} libs\n" >> $(spec_file)
$(ec)$(gprintf) "\n" >> $(spec_file)
$(ec)$(gprintf) "%%install\n" >> $(spec_file)
$(ec)$(gprintf) "make rpm_build_root=$$""RPM_BUILD_ROOT install_prefix=%%{prefix} lib_dir_name=%%{_lib} install\n" >> $(spec_file)
$(ec)$(gprintf) "$(percent)install\n" >> $(spec_file)
$(ec)$(gprintf) "make rpm_build_root=$(dollar)RPM_BUILD_ROOT install_prefix=$(percent){prefix} lib_dir_name=$(percent){_lib} install\n" >> $(spec_file)
$(ec)$(gprintf) "rm -rf $(build_output_dir)\n" >> $(spec_file)
$(ec)$(gprintf) "\n" >> $(spec_file)
$(ec)$(gprintf) "%%clean\n" >> $(spec_file)
$(ec)$(gprintf) "rm -rf $$""RPM_BUILD_ROOT\n" >> $(spec_file)
$(ec)$(gprintf) "$(percent)clean\n" >> $(spec_file)
$(ec)$(gprintf) "rm -rf $(dollar)RPM_BUILD_ROOT\n" >> $(spec_file)
$(ec)$(gprintf) "\n" >> $(spec_file)
$(ec)$(gprintf) "%%files\n" >> $(spec_file)
$(ec)$(gprintf) "%%defattr(-,root,root)\n" >> $(spec_file)
$(ec)$(gprintf) "%%doc COPYING VERSION\n" >> $(spec_file)
$(ec)$(gprintf) "%%{prefix}/%%{_lib}/$(lib_prefix)$(project_name)-$(version)$(shared_lib_suffix)\n" >> $(spec_file)
$(ec)$(gprintf) "%%{prefix}/%%{_lib}/$(lib_prefix)$(project_name)-$(major_version).$(minor_version)$(shared_lib_suffix)\n" >> $(spec_file)
$(ec)$(gprintf) "%%{prefix}/%%{_lib}/$(lib_prefix)$(project_name)-$(major_version)$(shared_lib_suffix)\n" >> $(spec_file)
$(ec)$(gprintf) "%%{prefix}/%%{_lib}/$(lib_prefix)$(project_name)$(shared_lib_suffix)\n" >> $(spec_file)
$(ec)$(gprintf) "$(percent)files\n" >> $(spec_file)
$(ec)$(gprintf) "$(percent)defattr(-,root,root)\n" >> $(spec_file)
$(ec)$(gprintf) "$(percent)doc COPYING VERSION\n" >> $(spec_file)
$(ec)$(gprintf) "$(percent){prefix}/$(percent){_lib}/$(lib_prefix)$(project_name)-$(version)$(shared_lib_suffix)\n" >> $(spec_file)
$(ec)$(gprintf) "$(percent){prefix}/$(percent){_lib}/$(lib_prefix)$(project_name)-$(major_version).$(minor_version)$(shared_lib_suffix)\n" >> $(spec_file)
$(ec)$(gprintf) "$(percent){prefix}/$(percent){_lib}/$(lib_prefix)$(project_name)-$(major_version)$(shared_lib_suffix)\n" >> $(spec_file)
$(ec)$(gprintf) "$(percent){prefix}/$(percent){_lib}/$(lib_prefix)$(project_name)$(shared_lib_suffix)\n" >> $(spec_file)
$(ec)$(gprintf) "\n" >> $(spec_file)
$(ec)$(gprintf) "%%files devel\n" >> $(spec_file)
$(ec)$(gprintf) "%%{prefix}/%%{_lib}/$(lib_prefix)$(project_name)$(lib_suffix)\n" >> $(spec_file)
$(ec)$(gprintf) "%%{prefix}/%%{_lib}/pkgconfig/$(pkgconfig_file_name)\n" >> $(spec_file)
$(ec)$(gprintf) "%%{prefix}/include/xflaim.h\n" >> $(spec_file)
$(ec)$(gprintf) "$(percent)files devel\n" >> $(spec_file)
$(ec)$(gprintf) "$(percent){prefix}/$(percent){_lib}/$(lib_prefix)$(project_name)$(lib_suffix)\n" >> $(spec_file)
$(ec)$(gprintf) "$(percent){prefix}/$(percent){_lib}/pkgconfig/$(pkgconfig_file_name)\n" >> $(spec_file)
$(ec)$(gprintf) "$(percent){prefix}/include/xflaim.h\n" >> $(spec_file)
# -- PKG-CONFIG --
.PHONY : pkgconfig
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) "includedir=$$""{prefix}/include\n\n" >> $(pkgconfig_file)
$(ec)$(gprintf) "exec_prefix=$(dollar){prefix}\n" >> $(pkgconfig_file)
$(ec)$(gprintf) "libdir=$(dollar){exec_prefix}/$(lib_dir_name)\n" >> $(pkgconfig_file)
$(ec)$(gprintf) "includedir=$(dollar){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)
$(ec)$(gprintf) "Libs: $(lib_link_libs) -lxflaim -L$(dollar){libdir}\n" >> $(pkgconfig_file)
$(ec)$(gprintf) "Cflags: -I$(dollar){includedir}\n" >> $(pkgconfig_file)
# -- SRCRPM --