summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorTor Lillqvist <tml@novell.com>2005-01-25 13:44:54 +0000
committerTor Lillqvist <tml@src.gnome.org>2005-01-25 13:44:54 +0000
commit383e82f446c9b5683cb541f54ef6fd8efa00dd7c (patch)
tree7e35ae6efdb70903e1e844c16ffb19ae537e01a4 /modules
parentc09a11ef462f63753c41aab0c70866065bf3a79b (diff)
downloadpango-383e82f446c9b5683cb541f54ef6fd8efa00dd7c.tar.gz
Don't use -p option to cp, can cause "failed to preserve ownership"
2005-01-25 Tor Lillqvist <tml@novell.com> * modules/basic/Makefile.am (usp10.h): Don't use -p option to cp, can cause "failed to preserve ownership" errors. * modules/*/Makefile.am (INCLUDES): Remove extraneous slash that confuse gcc on Win32.
Diffstat (limited to 'modules')
-rw-r--r--modules/arabic/Makefile.am2
-rw-r--r--modules/basic/Makefile.am2
-rw-r--r--modules/hangul/Makefile.am2
-rw-r--r--modules/hebrew/Makefile.am2
-rw-r--r--modules/indic/Makefile.am2
-rw-r--r--modules/syriac/Makefile.am2
-rw-r--r--modules/thai/Makefile.am2
-rw-r--r--modules/tibetan/Makefile.am2
8 files changed, 8 insertions, 8 deletions
diff --git a/modules/arabic/Makefile.am b/modules/arabic/Makefile.am
index 7684b6b8..9f5ca3ec 100644
--- a/modules/arabic/Makefile.am
+++ b/modules/arabic/Makefile.am
@@ -9,7 +9,7 @@ INCLUDES = \
-DG_DISABLE_DEPRECATED \
$(PANGO_DEBUG_FLAGS) \
-I$(top_srcdir) \
- -I$(top_srcdir)/pango/ \
+ -I$(top_srcdir)/pango \
$(GLIB_CFLAGS)
moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules
diff --git a/modules/basic/Makefile.am b/modules/basic/Makefile.am
index ad4580f1..4b9a30a1 100644
--- a/modules/basic/Makefile.am
+++ b/modules/basic/Makefile.am
@@ -75,7 +75,7 @@ basic-win32.lo: usp10.h
# Do it like this to avoid getting other headers from where usp10.h is
usp10.h: $(USP10_H)
- cp -p $(USP10_H) usp10.h
+ cp $(USP10_H) usp10.h
endif
diff --git a/modules/hangul/Makefile.am b/modules/hangul/Makefile.am
index 0a7f045d..f4b07ff9 100644
--- a/modules/hangul/Makefile.am
+++ b/modules/hangul/Makefile.am
@@ -9,7 +9,7 @@ INCLUDES = \
-DG_DISABLE_DEPRECATED \
$(PANGO_DEBUG_FLAGS) \
-I$(top_srcdir) \
- -I$(top_srcdir)/pango/ \
+ -I$(top_srcdir)/pango \
$(GLIB_CFLAGS)
if PLATFORM_WIN32
diff --git a/modules/hebrew/Makefile.am b/modules/hebrew/Makefile.am
index d9a86b4b..1ff56ab1 100644
--- a/modules/hebrew/Makefile.am
+++ b/modules/hebrew/Makefile.am
@@ -9,7 +9,7 @@ INCLUDES = \
-DG_DISABLE_DEPRECATED \
$(PANGO_DEBUG_FLAGS) \
-I$(top_srcdir) \
- -I$(top_srcdir)/pango/ \
+ -I$(top_srcdir)/pango \
$(GLIB_CFLAGS)
moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules
diff --git a/modules/indic/Makefile.am b/modules/indic/Makefile.am
index c6da3e63..24722f57 100644
--- a/modules/indic/Makefile.am
+++ b/modules/indic/Makefile.am
@@ -9,7 +9,7 @@ INCLUDES = \
-DG_DISABLE_DEPRECATED \
$(PANGO_DEBUG_FLAGS) \
-I$(top_srcdir) \
- -I$(top_srcdir)/pango/ \
+ -I$(top_srcdir)/pango \
$(GLIB_CFLAGS)
if PLATFORM_WIN32
diff --git a/modules/syriac/Makefile.am b/modules/syriac/Makefile.am
index d9dbbfbf..0f8e3a3a 100644
--- a/modules/syriac/Makefile.am
+++ b/modules/syriac/Makefile.am
@@ -9,7 +9,7 @@ INCLUDES = \
-DG_DISABLE_DEPRECATED \
$(PANGO_DEBUG_FLAGS) \
-I$(top_srcdir) \
- -I$(top_srcdir)/pango/ \
+ -I$(top_srcdir)/pango \
$(GLIB_CFLAGS)
moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules
diff --git a/modules/thai/Makefile.am b/modules/thai/Makefile.am
index e8a33aaf..63446ed4 100644
--- a/modules/thai/Makefile.am
+++ b/modules/thai/Makefile.am
@@ -9,7 +9,7 @@ INCLUDES = \
-DG_DISABLE_DEPRECATED \
$(PANGO_DEBUG_FLAGS) \
-I$(top_srcdir) \
- -I$(top_srcdir)/pango/ \
+ -I$(top_srcdir)/pango \
$(GLIB_CFLAGS)
if PLATFORM_WIN32
diff --git a/modules/tibetan/Makefile.am b/modules/tibetan/Makefile.am
index e4f3096f..2fe7f3bd 100644
--- a/modules/tibetan/Makefile.am
+++ b/modules/tibetan/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES = \
-DG_DISABLE_DEPRECATED \
$(PANGO_DEBUG_FLAGS) \
-I$(top_srcdir) \
- -I$(top_srcdir)/pango/ \
+ -I$(top_srcdir)/pango \
$(GLIB_CFLAGS)
if PLATFORM_WIN32