diff options
| author | Tor Lillqvist <tml@novell.com> | 2005-01-25 13:43:35 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2005-01-25 13:43:35 +0000 |
| commit | c7e0ef198c87b35284242a9bade3b14686cab581 (patch) | |
| tree | 3168d85c56995225c2580f8edb7a05e15bba0e79 | |
| parent | 9f5152cd4886f0340149b4a420cbf81df66d5dc1 (diff) | |
| download | pango-c7e0ef198c87b35284242a9bade3b14686cab581.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.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 8 | ||||
| -rw-r--r-- | modules/arabic/Makefile.am | 2 | ||||
| -rw-r--r-- | modules/basic/Makefile.am | 2 | ||||
| -rw-r--r-- | modules/hangul/Makefile.am | 2 | ||||
| -rw-r--r-- | modules/hebrew/Makefile.am | 2 | ||||
| -rw-r--r-- | modules/indic/Makefile.am | 2 | ||||
| -rw-r--r-- | modules/syriac/Makefile.am | 2 | ||||
| -rw-r--r-- | modules/thai/Makefile.am | 2 | ||||
| -rw-r--r-- | modules/tibetan/Makefile.am | 2 |
10 files changed, 24 insertions, 8 deletions
@@ -1,3 +1,11 @@ +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. + 2005-01-08 Matthias Clasen <mclasen@redhat.com> * pango.pc.in: Require gmodule-no-export-2.0 instead diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 6404a59c..0d416d33 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,11 @@ +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. + 2005-01-08 Matthias Clasen <mclasen@redhat.com> * pango.pc.in: Require gmodule-no-export-2.0 instead 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 50bef527..54736bf1 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 |