diff options
| author | unknown <kent@mysql.com> | 2005-11-04 02:17:11 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-11-04 02:17:11 +0100 |
| commit | 233c6b797ff6c124ba52ae4562bf7e95f86ea301 (patch) | |
| tree | c262a4298ddcdc1e1f99fba719003fc9894a837b /sql | |
| parent | 33bb96d9d2bbec5eac3944be4b1e631128733547 (diff) | |
| parent | b0701a5c3b3653082d69ee2429ba279adce2f53b (diff) | |
| download | mariadb-git-233c6b797ff6c124ba52ae4562bf7e95f86ea301.tar.gz | |
Merge
Makefile.am:
Auto merged
client/Makefile.am:
Auto merged
libmysql/Makefile.am:
Auto merged
libmysql_r/Makefile.am:
Auto merged
libmysqld/Makefile.am:
Auto merged
mysql-test/Makefile.am:
Auto merged
netware/Makefile.am:
Auto merged
support-files/Makefile.am:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/Makefile.am | 10 | ||||
| -rw-r--r-- | sql/share/Makefile.am | 7 |
2 files changed, 12 insertions, 5 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am index 2450f18c970..1437751bf2f 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -122,17 +122,17 @@ AM_YFLAGS = -d mysql_tzinfo_to_sql.cc: rm -f mysql_tzinfo_to_sql.cc - @LN_CP_F@ tztime.cc mysql_tzinfo_to_sql.cc + @LN_CP_F@ $(srcdir)/tztime.cc mysql_tzinfo_to_sql.cc link_sources: mysql_tzinfo_to_sql.cc rm -f mini_client_errors.c - @LN_CP_F@ ../libmysql/errmsg.c mini_client_errors.c + @LN_CP_F@ $(top_srcdir)/libmysql/errmsg.c mini_client_errors.c rm -f pack.c - @LN_CP_F@ ../sql-common/pack.c pack.c + @LN_CP_F@ $(top_srcdir)/sql-common/pack.c pack.c rm -f client.c - @LN_CP_F@ ../sql-common/client.c client.c + @LN_CP_F@ $(top_srcdir)/sql-common/client.c client.c rm -f my_time.c - @LN_CP_F@ ../sql-common/my_time.c my_time.c + @LN_CP_F@ $(top_srcdir)/sql-common/my_time.c my_time.c mysql_tzinfo_to_sql.o: $(mysql_tzinfo_to_sql_SOURCES) $(CXXCOMPILE) -c $(INCLUDES) -DTZINFO2SQL $< diff --git a/sql/share/Makefile.am b/sql/share/Makefile.am index 2e23027f1f5..d860b2b40c1 100644 --- a/sql/share/Makefile.am +++ b/sql/share/Makefile.am @@ -49,5 +49,12 @@ install-data-local: $(INSTALL_DATA) $(srcdir)/charsets/README $(DESTDIR)$(pkgdatadir)/charsets/README $(INSTALL_DATA) $(srcdir)/charsets/*.xml $(DESTDIR)$(pkgdatadir)/charsets +# FIXME maybe shouldn't remove, could be needed by other installation? +uninstall-local: + @RM@ -f -r $(DESTDIR)$(pkgdatadir) + +# Do nothing +link_sources: + # Don't update the files from bitkeeper %::SCCS/s.% |