From 137da08d26352e7e45c558d11032b76c41429a41 Mon Sep 17 00:00:00 2001 From: ahodgkinson Date: Tue, 3 Oct 2006 23:14:19 +0000 Subject: [PATCH] More changes for Ubuntu. git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@960 0109f412-320b-0410-ab79-c3e0c5ffbbe6 --- flaim/Makefile | 2 +- xflaim/ChangeLog.ubuntu | 1 + xflaim/Makefile | 2 +- xflaim/debian/rules | 3 +-- 4 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 xflaim/ChangeLog.ubuntu diff --git a/flaim/Makefile b/flaim/Makefile index 8c651e9..e0ee4dd 100644 --- a/flaim/Makefile +++ b/flaim/Makefile @@ -2066,7 +2066,7 @@ endif -$(ec)$(call rmdircmd,$(ubuntu_stage_dir)/tmp) $(ec)$(call mkdircmd,$(ubuntu_stage_dir)/tmp) - $(ec)$(call copycMd,$(bin_package_dir)/$(bin_package_name),$(ubuntu_stage_dir)/tmp) + $(ec)$(call copycmd,$(bin_package_dir)/$(bin_package_name),$(ubuntu_stage_dir)/tmp) $(ec)$(call extract_archive,$(ubuntu_stage_dir)/tmp,$(bin_package_base_name)) $(ec)$(call mkdircmd,$(ubuntu_stage_dir)/usr) $(ec)$(call mkdircmd,$(ubuntu_stage_dir)/usr/lib) diff --git a/xflaim/ChangeLog.ubuntu b/xflaim/ChangeLog.ubuntu new file mode 100644 index 0000000..048fe4d --- /dev/null +++ b/xflaim/ChangeLog.ubuntu @@ -0,0 +1 @@ + * Initial revision for Ubuntu diff --git a/xflaim/Makefile b/xflaim/Makefile index f0983df..a16c713 100644 --- a/xflaim/Makefile +++ b/xflaim/Makefile @@ -2450,7 +2450,7 @@ endif -$(ec)$(call rmdircmd,$(ubuntu_stage_dir)/tmp) $(ec)$(call mkdircmd,$(ubuntu_stage_dir)/tmp) - $(ec)$(call copycMd,$(bin_package_dir)/$(bin_package_name),$(ubuntu_stage_dir)/tmp) + $(ec)$(call copycmd,$(bin_package_dir)/$(bin_package_name),$(ubuntu_stage_dir)/tmp) $(ec)$(call extract_archive,$(ubuntu_stage_dir)/tmp,$(bin_package_base_name)) $(ec)$(call mkdircmd,$(ubuntu_stage_dir)/usr) $(ec)$(call mkdircmd,$(ubuntu_stage_dir)/usr/lib) diff --git a/xflaim/debian/rules b/xflaim/debian/rules index 0d0e9a9..5a1e0b0 100644 --- a/xflaim/debian/rules +++ b/xflaim/debian/rules @@ -9,7 +9,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 - CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -44,7 +43,7 @@ install: build dh_clean -k dh_installdirs - $(MAKE) install DESTDIR=$(CURDIR)/debian/libflaim + $(MAKE) install DESTDIR=$(CURDIR)/debian/libxflaim binary-indep: build install