Updated Makefile and desktop file to support distro packaging #107
Conversation
Makefile
Outdated
| @@ -6,6 +6,10 @@ UNAME_S := $(shell uname -s) | |||
| GIT_DATE := $(firstword $(shell git --no-pager show --date=short --format="%ai" --name-only)) | |||
| GIT_VERSION := $(shell git describe --abbrev=0 --tags) | |||
|
|
|||
| PREFIX=/usr/local | |||
There was a problem hiding this comment.
Allow override of PREFIX, BINDIR, DATADIR and also support installation to arbitrary DESTDIR which is required by distro packaging.
Makefile
Outdated
| @@ -273,7 +277,7 @@ actions.o | |||
|
|
|||
|
|
|||
| $(PROGRAM): $(OBJS) $(SOAPYSDR_OBJS) $(CWDAEMON_OBJS) $(MIDI_OBJS) | |||
| $(LINK) -o $(PROGRAM) $(OBJS) $(SOAPYSDR_OBJS) $(CWDAEMON_OBJS) $(MIDI_OBJS) $(LIBS) | |||
| $(LINK) -o $(PROGRAM) $(LDFLAGS) $(OBJS) $(SOAPYSDR_OBJS) $(CWDAEMON_OBJS) $(MIDI_OBJS) $(LIBS) | |||
Makefile
Outdated
| @@ -288,12 +292,12 @@ clean: | |||
| -rm -f $(PROGRAM) | |||
|
|
|||
| install: $(PROGRAM) | |||
| cp $(PROGRAM) /usr/local/bin | |||
There was a problem hiding this comment.
Fix parallel installation by processing commands sequentially.
Use mkdir -p for creation of all directories.
Use cp -a to preserve build timestamps (probably better to use install -p.
Install hspdr_icon.png to the proper system wide place.
| @@ -1,9 +1,7 @@ | |||
| [Desktop Entry] | |||
| Version=0.1 | |||
There was a problem hiding this comment.
This is version of the desktop file specification, not the program version. The 0.1 is invalid desktop file specificaiton version. This entry is optional, thus drop it.
| Type=Application | ||
| Terminal=false | ||
| Name[eb_GB]=linHPSDR | ||
| Exec=linhpsdr | ||
| Icon=/usr/share/linhpsdr/hpsdr_small.png |
|
FYI: we are trying to get this package to Fedora: |
|
Looks good to me. Merge conflicts though, will have a look at at that. |
Signed-off-by: Jaroslav Škarvada <[email protected]>
|
Rebased. |
|
Merged to andreasdotorg/linhpsdr |
Signed-off-by: Jaroslav Škarvada [email protected]