Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

write absolute path to geany bin in desktop file #2728

Closed
wants to merge 8 commits into from
Closed

write absolute path to geany bin in desktop file #2728

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d8b1001
writes absolute path to geany bin in desktop file
andy5995 Jan 15, 2021
786a4ca
specify path to geany.desktop.in in POTFILES.in
andy5995 Jan 16, 2021
4082f98
use pkg description in about.c and libmain.c as well
andy5995 Jan 16, 2021
a3fdfe1
Revert "use pkg description in about.c and libmain.c as well"
andy5995 Jan 16, 2021
639e610
Revert "specify path to geany.desktop.in in POTFILES.in"
andy5995 Jan 18, 2021
30de359
Revert "writes absolute path to geany bin in desktop file"
andy5995 Jan 18, 2021
d16ead8
use sed to replace Exec line with path
andy5995 Jan 18, 2021
e2d328c
append '%F' to Exec line
andy5995 Jan 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion Makefile.am
View file
Open in desktop
Expand Up @@ -37,6 +37,7 @@ uninstall-local:

# manually install some files under another name
install-data-local:
sed -i '/Exec=/c\Exec=@bindir@/geany' @top_builddir@/geany.desktop
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
$(INSTALL_DATA) $(srcdir)/COPYING $(DESTDIR)$(pkgdatadir)/GPL-2
if MINGW
Expand Down Expand Up @@ -80,5 +81,5 @@ pkgconfigdir = $(libdir)/pkgconfig

desktopdir = $(datadir)/applications
desktop_in_files = geany.desktop
desktop_DATA = $(desktop_in_files:.@top_builddir@/desktop.in=.desktop)
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
5 changes: 0 additions & 5 deletions configure.ac
View file
Open in desktop
Expand Up @@ -9,9 +9,6 @@ AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([1.11 -Wall parallel-tests subdir-objects])
AC_CONFIG_HEADERS([config.h])

PKG_DESC="A fast and lightweight IDE using GTK+"
AC_SUBST([PKG_DESC])

m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])

GEANY_PREFIX
Expand Down Expand Up @@ -185,12 +182,10 @@ AC_CONFIG_FILES([
src/tagmanager/Makefile
plugins/Makefile
po/Makefile.in
po/POTFILES.in
data/Makefile
data/filedefs/filetypes.python
doc/Makefile
doc/geany.1
geany.desktop.in
geany.pc
geany.nsi
doc/Doxyfile
Expand Down
6 changes: 3 additions & 3 deletions geany.desktop.in.in → geany.desktop.in
View file
Open in desktop
@@ -1,10 +1,10 @@
[Desktop Entry]
Type=Application
Version=1.0
_Name=@PACKAGE_NAME@
_Name=Geany
_GenericName=Integrated Development Environment
_Comment=@PKG_DESC@
Exec=@BINDIR@/geany %F
_Comment=A fast and lightweight IDE using GTK+
Exec=geany %F
Icon=geany
Terminal=false
Categories=GTK;Development;IDE;TextEditor;
Expand Down
4 changes: 2 additions & 2 deletions geany.pc.in
View file
Open in desktop
Expand Up @@ -6,8 +6,8 @@ datarootdir=@datarootdir@
datadir=@datadir@
localedir=@localedir@

Name: @PACKAGE_NAME@
Description: @PKG_DESC@
Name: Geany
Description: A fast and lightweight IDE using GTK+
Requires: @DEPENDENCIES@
Version: @VERSION@
Libs: -L${libdir} -lgeany
Expand Down
12 changes: 0 additions & 12 deletions m4/geany-utils.m4
View file
Open in desktop
Expand Up @@ -11,18 +11,6 @@ AC_DEFUN([GEANY_PREFIX],
if test "x$exec_prefix" = xNONE; then
exec_prefix=$prefix
fi

# The $bindir variable is equal to the literal string "${exec_dir}/bin"
# rather than the actual path. pkgconfig (.pc) files can use that ok, but
# other files written out by configure require the literal path.
#
# If the --bindir argument is given to configure, then $bindir will already
# be equal to an absolute path.
BINDIR=$bindir
if test "x$BINDIR" = "x\${exec_prefix}/bin"; then
BINDIR=${exec_prefix}/bin
fi
AC_SUBST([BINDIR])
])

dnl GEANY_DOCDIR
Expand Down
2 changes: 1 addition & 1 deletion po/POTFILES.in.in → po/POTFILES.in
View file
Open in desktop
@@ -1,6 +1,6 @@
# List of source files containing translatable strings.

@top_builddir@/geany.desktop.in
geany.desktop.in
data/geany.glade
src/about.c
src/build.c
Expand Down