Commit 8ba69ba6 authored by Garrett Regier's avatar Garrett Regier

Bug 621548 - Install everything into gedit/

parent 2657faa0
......@@ -367,10 +367,10 @@ AC_SUBST(GEDIT_IMPLIB)
AC_SUBST(PLUGIN_LIBTOOL_FLAGS)
AC_SUBST(LOADER_LIBTOOL_FLAGS)
GEDIT_PLUGINS_DATA_DIR="$datadir/gedit-2/plugins"
GEDIT_PLUGINS_DATA_DIR="$datadir/gedit/plugins"
AC_SUBST(GEDIT_PLUGINS_DATA_DIR)
GEDIT_PLUGINS_LIBS_DIR="$libdir/gedit-2/plugins"
GEDIT_PLUGINS_LIBS_DIR="$libdir/gedit/plugins"
AC_SUBST(GEDIT_PLUGINS_LIBS_DIR)
GNOME_DOC_INIT([0.9.0],,
......
......@@ -13,12 +13,9 @@ $(service_DATA): $(service_in_files) Makefile
man_MANS = gedit.1
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gedit-@GEDIT_API_VERSION@.pc
pkgconfig_DATA = gedit.pc
gedit-@GEDIT_API_VERSION@.pc: gedit.pc
cp gedit.pc gedit-@GEDIT_API_VERSION@.pc
bugreportdir = $(libexecdir)/gedit-2
bugreportdir = $(libexecdir)/gedit
bugreport_SCRIPTS = gedit-bugreport.sh
gsettings_SCHEMAS = org.gnome.gedit.gschema.xml
......
......@@ -15,4 +15,4 @@ X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gedit
X-GNOME-Bugzilla-Component=general
X-GNOME-Bugzilla-Version=@VERSION@
X-GNOME-Bugzilla-ExtraInfoScript=@FULL_LIBEXECDIR@/gedit-2/gedit-bugreport.sh
X-GNOME-Bugzilla-ExtraInfoScript=@FULL_LIBEXECDIR@/gedit/gedit-bugreport.sh
......@@ -28,7 +28,7 @@ gedit_LDADD = \
$(INTROSPECTION_LIBS)
if PLATFORM_WIN32
gedit_LDFLAGS = -Wl,--export-all-symbols -Wl,--out-implib,libgedit-$(GEDIT_API_VERSION).a
gedit_LDFLAGS = -Wl,--export-all-symbols -Wl,--out-implib,libgedit.a
else
gedit_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*"
endif
......@@ -153,7 +153,7 @@ if !ENABLE_GVFS_METADATA
INST_H_FILES += gedit-metadata-manager.h
endif
headerdir = $(prefix)/include/gedit-@GEDIT_API_VERSION@/gedit
headerdir = $(prefix)/include/gedit/gedit
header_DATA = \
$(INST_H_FILES)
......@@ -244,7 +244,7 @@ gedit-marshal.c: gedit-marshal.list $(GLIB_GENMARSHAL)
$(AM_V_GEN) echo "#include \"gedit-marshal.h\"" > $@ && \
$(GLIB_GENMARSHAL) $< --body --prefix=gedit_marshal >> $@
uidir = $(datadir)/gedit-2/ui/
uidir = $(datadir)/gedit/ui/
ui_DATA = \
gedit-ui.xml \
gedit-print-preferences.ui
......@@ -287,7 +287,7 @@ dist-hook:
install-exec-hook:
if PLATFORM_WIN32
$(mkinstalldirs) "$(DESTDIR)$(libdir)"
$(INSTALL_DATA) libgedit-$(GEDIT_API_VERSION).a "$(DESTDIR)$(libdir)"
$(INSTALL_DATA) libgedit.a "$(DESTDIR)$(libdir)"
else
rm -f $(DESTDIR)$(bindir)/gnome-text-editor
ln -s gedit $(DESTDIR)$(bindir)/gnome-text-editor
......
uidir = $(datadir)/gedit-2/ui/
uidir = $(datadir)/gedit/ui/
INCLUDES = \
-I$(top_srcdir) \
......
......@@ -161,7 +161,7 @@ gedit_dirs_get_gedit_data_dir (void)
data_dir = g_build_filename (win32_dir,
"share",
"gedit-2",
"gedit",
NULL);
g_free (win32_dir);
......@@ -173,16 +173,18 @@ gedit_dirs_get_gedit_data_dir (void)
const gchar *bundle_data_dir = ige_mac_bundle_get_datadir (bundle);
data_dir = g_build_filename (bundle_data_dir,
"gedit-2",
NULL);
"gedit",
NULL);
}
else
{
data_dir = g_build_filename (DATADIR, "gedit-2", NULL);
data_dir = g_build_filename (DATADIR,
"gedit",
NULL);
}
#else
data_dir = g_build_filename (DATADIR,
"gedit-2",
"gedit",
NULL);
#endif
......@@ -239,7 +241,7 @@ gedit_dirs_get_gedit_lib_dir (void)
lib_dir = g_build_filename (win32_dir,
"lib",
"gedit-2",
"gedit",
NULL);
g_free (win32_dir);
......@@ -251,18 +253,18 @@ gedit_dirs_get_gedit_lib_dir (void)
const gchar *path = ige_mac_bundle_get_resourcesdir (bundle);
lib_dir = g_build_filename (path,
"lib",
"gedit-2",
"gedit",
NULL);
}
else
{
lib_dir = g_build_filename (LIBDIR,
"gedit-2",
"gedit",
NULL);
}
#else
lib_dir = g_build_filename (LIBDIR,
"gedit-2",
"gedit",
NULL);
#endif
......
......@@ -220,7 +220,7 @@ gedit_plugin_get_data_dir (GeditPlugin *plugin)
/* If it's a "user" plugin the data dir is
* install_dir/data_dir_name if instead it's a
* "system" plugin the data dir is under gedit_data_dir,
* so it's under $prefix/share/gedit-2/plugins/data_dir_name
* so it's under $prefix/share/gedit/plugins/data_dir_name
* where data_dir_name usually it's the name of the plugin
*/
gedit_lib_dir = gedit_dirs_get_gedit_lib_dir ();
......
icondir = $(datadir)/gedit-2/icons
icondir = $(datadir)/gedit/icons
icon_DATA = gedit-plugin.png
logodir = $(datadir)/gedit-2/logo
logodir = $(datadir)/gedit/logo
logo_DATA = gedit-logo.png
EXTRA_DIST = \
......
# C plugin loader
loaderdir = $(libdir)/gedit-2/plugin-loaders
loaderdir = $(libdir)/gedit/plugin-loaders
INCLUDES = \
-I$(top_srcdir) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment