Skip to content

Commit 9febac9

Browse files
wb2oszwb2osz
committed
Clean up Linux install locations.
1 parent 78283e1 commit 9febac9

File tree

2 files changed

+113
-67
lines changed

2 files changed

+113
-67
lines changed

‎Makefile.linux

+59-54
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ endif
210210
# If you compile with the RPi 2 specific options above and try to run it on the RPi
211211
# model B (pre version 2), it will die with "illegal instruction."
212212
#
213-
# Dire Wolf is known to work on the BeagleBone, CubieBoard2, etc.
213+
# Dire Wolf is known to work on the BeagleBone, CubieBoard2, CHIP, etc.
214214
# The best compiler options will depend on the specific type of processor
215215
# and the compiler target defaults.
216216
#
@@ -292,12 +292,14 @@ LDFLAGS += -lhamlib
292292
endif
293293

294294

295+
# Should enabling of this feature be strongly encouraged or
296+
# is it quite specialized and of interest to a small audience?
295297
# If, for some reason, can obtain the libudev-dev package, or
296298
# don't want to install it, comment out the next 3 lines.
297299

298-
ifeq ($(wildcard /usr/include/libudev.h),)
299-
$(error /usr/include/libudev.h does not exist. Install it with "sudo apt-get install libudev-dev" or "sudo yum install libudev-devel" )
300-
endif
300+
#ifeq ($(wildcard /usr/include/libudev.h),)
301+
#$(error /usr/include/libudev.h does not exist. Install it with "sudo apt-get install libudev-dev" or "sudo yum install libudev-devel" )
302+
#endif
301303

302304

303305
# Enable cm108 PTT support if libudev header file is present.
@@ -541,6 +543,7 @@ direwolf.conf : generic.conf
541543
# Eventually I'd like to have targets here to build the .DEB and .RPM packages.
542544

543545
INSTALLDIR := /usr/local
546+
#INSTALLDIR := /usr
544547

545548
# Command to "install" to system directories. Use "ginstall" for Mac.
546549

@@ -566,14 +569,14 @@ else
566569
endif
567570
@echo 'Name=Dire Wolf' >> $@
568571
@echo 'Comment=APRS Soundcard TNC' >> $@
569-
@echo 'Icon=/usr/share/direwolf/dw-icon.png' >> $@
572+
@echo 'Icon=$(INSTALLDIR)/share/direwolf/dw-icon.png' >> $@
570573
@echo "Path=$(HOME)" >> $@
571574
@echo '#Terminal=true' >> $@
572575
@echo 'Categories=HamRadio' >> $@
573576
@echo 'Keywords=Ham Radio;APRS;Soundcard TNC;KISS;AGWPE;AX.25' >> $@
574577

575578

576-
# Installation into /usr/local/...
579+
# Installation into $(INSTALLDIR), usually /usr/local/... or /usr/...
577580
# Needs to be run as root or with sudo.
578581

579582

@@ -583,40 +586,40 @@ install : $(APPS) direwolf.conf tocalls.txt symbols-new.txt symbolsX.txt dw-icon
583586
# Applications, not installed with package manager, normally go in /usr/local/bin.
584587
# /usr/bin is used instead when installing from .DEB or .RPM package.
585588
#
586-
$(INSTALL) direwolf $(INSTALLDIR)/bin
587-
$(INSTALL) decode_aprs $(INSTALLDIR)/bin
588-
$(INSTALL) text2tt $(INSTALLDIR)/bin
589-
$(INSTALL) tt2text $(INSTALLDIR)/bin
590-
$(INSTALL) ll2utm $(INSTALLDIR)/bin
591-
$(INSTALL) utm2ll $(INSTALLDIR)/bin
592-
$(INSTALL) aclients $(INSTALLDIR)/bin
593-
$(INSTALL) log2gpx $(INSTALLDIR)/bin
594-
$(INSTALL) gen_packets $(INSTALLDIR)/bin
595-
$(INSTALL) atest $(INSTALLDIR)/bin
596-
$(INSTALL) ttcalc $(INSTALLDIR)/bin
597-
$(INSTALL) kissutil $(INSTALLDIR)/bin
598-
$(INSTALL) cm108 $(INSTALLDIR)/bin
599-
$(INSTALL) dwespeak.sh $(INSTALLDIR)/bin
589+
$(INSTALL) -D --mode=755 direwolf $(INSTALLDIR)/bin/direwolf
590+
$(INSTALL) -D --mode=755 decode_aprs $(INSTALLDIR)/bin/decode_aprs
591+
$(INSTALL) -D --mode=755 text2tt $(INSTALLDIR)/bin/text2tt
592+
$(INSTALL) -D --mode=755 tt2text $(INSTALLDIR)/bin/tt2text
593+
$(INSTALL) -D --mode=755 ll2utm $(INSTALLDIR)/bin/ll2utm
594+
$(INSTALL) -D --mode=755 utm2ll $(INSTALLDIR)/bin/utm2ll
595+
$(INSTALL) -D --mode=755 aclients $(INSTALLDIR)/bin/aclients
596+
$(INSTALL) -D --mode=755 log2gpx $(INSTALLDIR)/bin/log2gpx
597+
$(INSTALL) -D --mode=755 gen_packets $(INSTALLDIR)/bin/gen_packets
598+
$(INSTALL) -D --mode=755 atest $(INSTALLDIR)/bin/atest
599+
$(INSTALL) -D --mode=755 ttcalc $(INSTALLDIR)/bin/ttcalc
600+
$(INSTALL) -D --mode=755 kissutil $(INSTALLDIR)/bin/kissutil
601+
$(INSTALL) -D --mode=755 cm108 $(INSTALLDIR)/bin/cm108
602+
$(INSTALL) -D --mode=755 dwespeak.sh $(INSTALLDIR)/bin/dwspeak.sh
600603
#
601604
# Telemetry Toolkit executables. Other .conf and .txt files will go into doc directory.
602605
#
603-
$(INSTALL) telemetry-toolkit/telem-balloon.pl $(INSTALLDIR)/bin
604-
$(INSTALL) telemetry-toolkit/telem-bits.pl $(INSTALLDIR)/bin
605-
$(INSTALL) telemetry-toolkit/telem-data.pl $(INSTALLDIR)/bin
606-
$(INSTALL) telemetry-toolkit/telem-data91.pl $(INSTALLDIR)/bin
607-
$(INSTALL) telemetry-toolkit/telem-eqns.pl $(INSTALLDIR)/bin
608-
$(INSTALL) telemetry-toolkit/telem-parm.pl $(INSTALLDIR)/bin
609-
$(INSTALL) telemetry-toolkit/telem-seq.sh $(INSTALLDIR)/bin
610-
$(INSTALL) telemetry-toolkit/telem-unit.pl $(INSTALLDIR)/bin
611-
$(INSTALL) telemetry-toolkit/telem-volts.py $(INSTALLDIR)/bin
606+
$(INSTALL) -D --mode=755 telemetry-toolkit/telem-balloon.pl $(INSTALLDIR)/bin/telem-balloon.pl
607+
$(INSTALL) -D --mode=755 telemetry-toolkit/telem-bits.pl $(INSTALLDIR)/bin/telem-bits.pl
608+
$(INSTALL) -D --mode=755 telemetry-toolkit/telem-data.pl $(INSTALLDIR)/bin/telem-data.pl
609+
$(INSTALL) -D --mode=755 telemetry-toolkit/telem-data91.pl $(INSTALLDIR)/bin/telem-data91.pl
610+
$(INSTALL) -D --mode=755 telemetry-toolkit/telem-eqns.pl $(INSTALLDIR)/bin/telem-eqns.pl
611+
$(INSTALL) -D --mode=755 telemetry-toolkit/telem-parm.pl $(INSTALLDIR)/bin/telem-parm.pl
612+
$(INSTALL) -D --mode=755 telemetry-toolkit/telem-seq.sh $(INSTALLDIR)/bin/telem-seq.sh
613+
$(INSTALL) -D --mode=755 telemetry-toolkit/telem-unit.pl $(INSTALLDIR)/bin/telem-unit.pl
614+
$(INSTALL) -D --mode=755 telemetry-toolkit/telem-volts.py $(INSTALLDIR)/bin/telem-volts.py
612615
#
613616
# Misc. data such as "tocall" to system mapping.
614617
#
615-
$(INSTALL) -D --mode=644 tocalls.txt /usr/share/direwolf/tocalls.txt
616-
$(INSTALL) -D --mode=644 symbols-new.txt /usr/share/direwolf/symbols-new.txt
617-
$(INSTALL) -D --mode=644 symbolsX.txt /usr/share/direwolf/symbolsX.txt
618-
$(INSTALL) -D --mode=644 dw-icon.png /usr/share/direwolf/dw-icon.png
619-
$(INSTALL) -D --mode=644 direwolf.desktop /usr/share/applications/direwolf.desktop
618+
$(INSTALL) -D --mode=644 tocalls.txt $(INSTALLDIR)/share/direwolf/tocalls.txt
619+
$(INSTALL) -D --mode=644 symbols-new.txt $(INSTALLDIR)/share/direwolf/symbols-new.txt
620+
$(INSTALL) -D --mode=644 symbolsX.txt $(INSTALLDIR)/share/direwolf/symbolsX.txt
621+
$(INSTALL) -D --mode=644 dw-icon.png $(INSTALLDIR)/share/direwolf/dw-icon.png
622+
$(INSTALL) -D --mode=644 direwolf.desktop $(INSTALLDIR)/share/applications/direwolf.desktop
620623
#
621624
# Documentation. Various plain text files and PDF.
622625
#
@@ -625,6 +628,7 @@ install : $(APPS) direwolf.conf tocalls.txt symbols-new.txt symbolsX.txt dw-icon
625628
$(INSTALL) -D --mode=644 LICENSE-other.txt $(INSTALLDIR)/share/doc/direwolf/LICENSE-other.txt
626629
#
627630
# ./README.md is an overview for the project main page.
631+
# Maybe we could stick it in some other place.
628632
# doc/README.md contains an overview of the PDF file contents and is more useful here.
629633
#
630634
$(INSTALL) -D --mode=644 doc/README.md $(INSTALLDIR)/share/doc/direwolf/README.md
@@ -659,17 +663,17 @@ install : $(APPS) direwolf.conf tocalls.txt symbols-new.txt symbolsX.txt dw-icon
659663
#
660664
# "man" pages
661665
#
662-
$(INSTALL) -D --mode=644 man1/aclients.1 $(INSTALLDIR)/man/man1/aclients.1
663-
$(INSTALL) -D --mode=644 man1/atest.1 $(INSTALLDIR)/man/man1/atest.1
664-
$(INSTALL) -D --mode=644 man1/decode_aprs.1 $(INSTALLDIR)/man/man1/decode_aprs.1
665-
$(INSTALL) -D --mode=644 man1/direwolf.1 $(INSTALLDIR)/man/man1/direwolf.1
666-
$(INSTALL) -D --mode=644 man1/gen_packets.1 $(INSTALLDIR)/man/man1/gen_packets.1
667-
$(INSTALL) -D --mode=644 man1/kissutil.1 $(INSTALLDIR)/man/man1/kissutil.1
668-
$(INSTALL) -D --mode=644 man1/ll2utm.1 $(INSTALLDIR)/man/man1/ll2utm.1
669-
$(INSTALL) -D --mode=644 man1/log2gpx.1 $(INSTALLDIR)/man/man1/log2gpx.1
670-
$(INSTALL) -D --mode=644 man1/text2tt.1 $(INSTALLDIR)/man/man1/text2tt.1
671-
$(INSTALL) -D --mode=644 man1/tt2text.1 $(INSTALLDIR)/man/man1/tt2text.1
672-
$(INSTALL) -D --mode=644 man1/utm2ll.1 $(INSTALLDIR)/man/man1/utm2ll.1
666+
$(INSTALL) -D --mode=644 man1/aclients.1 $(INSTALLDIR)/share/man/man1/aclients.1
667+
$(INSTALL) -D --mode=644 man1/atest.1 $(INSTALLDIR)/share/man/man1/atest.1
668+
$(INSTALL) -D --mode=644 man1/decode_aprs.1 $(INSTALLDIR)/share/man/man1/decode_aprs.1
669+
$(INSTALL) -D --mode=644 man1/direwolf.1 $(INSTALLDIR)/share/man/man1/direwolf.1
670+
$(INSTALL) -D --mode=644 man1/gen_packets.1 $(INSTALLDIR)/share/man/man1/gen_packets.1
671+
$(INSTALL) -D --mode=644 man1/kissutil.1 $(INSTALLDIR)/share/man/man1/kissutil.1
672+
$(INSTALL) -D --mode=644 man1/ll2utm.1 $(INSTALLDIR)/share/man/man1/ll2utm.1
673+
$(INSTALL) -D --mode=644 man1/log2gpx.1 $(INSTALLDIR)/share/man/man1/log2gpx.1
674+
$(INSTALL) -D --mode=644 man1/text2tt.1 $(INSTALLDIR)/share/man/man1/text2tt.1
675+
$(INSTALL) -D --mode=644 man1/tt2text.1 $(INSTALLDIR)/share/man/man1/tt2text.1
676+
$(INSTALL) -D --mode=644 man1/utm2ll.1 $(INSTALLDIR)/share/man/man1/utm2ll.1
673677
#
674678
# Set group and mode of HID devices corresponding to C-Media USB Audio adapters.
675679
# This will allow us to use the CM108/CM119 GPIO pins for PTT.
@@ -684,22 +688,28 @@ install : $(APPS) direwolf.conf tocalls.txt symbols-new.txt symbolsX.txt dw-icon
684688
@echo " "
685689

686690

687-
# Put sample configuration files in home directory.
688-
# These would be done as ordinary user.
691+
# Put sample configuration & startup files in home directory.
692+
# This step would be done as ordinary user.
693+
# Some people like to put the direwolf config file in /etc/ax25.
694+
# Note that all of these are also in $(INSTALLDIR)/share/doc/direwolf/examples/.
689695

690696
# The Raspberry Pi has ~/Desktop but Ubuntu does not.
691697

692698
# TODO: Handle Linux variations correctly.
693699

694700
# Version 1.4 - Add "-n" option to avoid clobbering existing, probably customized, config files.
695701

702+
# dw-start.sh is greatly improved in version 1.4.
703+
# It was moved from isntall-rpi to install-conf because it is not just for the RPi.
696704

697705
.PHONY: install-conf
698706
install-conf : direwolf.conf
699707
cp -n direwolf.conf ~
700708
cp -n sdr.conf ~
701709
cp -n telemetry-toolkit/telem-m0xer-3.txt ~
702710
cp -n telemetry-toolkit/telem-*.conf ~
711+
chmod +x dw-start.sh
712+
cp -n dw-start.sh ~
703713
ifneq ($(wildcard $(HOME)/Desktop),)
704714
@echo " "
705715
@echo "This will add a desktop icon on some systems."
@@ -710,14 +720,9 @@ ifneq ($(wildcard $(HOME)/Desktop),)
710720
endif
711721

712722

713-
# dw-start.sh is greatly improved in version 1.4.
714-
# It should probably be part of install-conf because it is not just for the RPi.
715-
716723
.PHONY: install-rpi
717-
install-rpi : dw-start.sh
718-
chmod +x dw-start.sh
719-
cp -n dw-start.sh ~
720-
ln -f -s /usr/share/applications/direwolf.desktop ~/Desktop/direwolf.desktop
724+
install-rpi :
725+
ln -f -s $(INSTALLDIR)/share/applications/direwolf.desktop ~/Desktop/direwolf.desktop
721726

722727

723728

‎direwolf.spec

+54-13
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,31 @@
1+
#%global git_commit b2548ec58f44f4b651626757a166b9f4f18d8000
2+
%global git_commit 37179479caf0bf36adf8c9bc0fde641884edaeac
3+
%global git_date 20171216
4+
5+
%global git_short_commit %(echo %{git_commit} | cut -c -8)
6+
%global git_suffix %{git_date}git%{git_short_commit}
7+
18
Name: direwolf
2-
Version: 1.1b1
3-
Release: 1%{?dist}
9+
Version: 1.5Beta
10+
Release: 1.%{git_suffix}%{?dist}
411
Summary: Soundcard based AX.25 TNC
512

613
Group: Applications/Communications
714
License: GPLv2
8-
URL: http://home.comcast.net/~wb2osz
9-
Source0: http://home.comcast.net/~wb2osz/Version%201.1/direwolf-%{version}.tgz
15+
URL: https://github.com/wb2osz/direwolf
16+
#Source0: https://github.com/wb2osz/direwolf/archive/%{name}-%{version}.tar.gz
17+
Source: %{name}-%{version}-%{git_suffix}.tgz
1018
Packager: David Ranch (KI6ZHD) <dranch@trinnet.net>
1119
Distribution: RedHat Linux
1220

13-
Patch0: direwolf-makefile7.patch
21+
Patch0: direwolf-1.5-makefile.patch
1422

1523
BuildRequires: automake
1624
BuildRequires: alsa-lib-devel
1725

26+
#If the gpsd and gpsd-devel packages are installed, Direwolf will add gps support
27+
28+
1829

1930
%description
2031
Dire Wolf is a software "soundcard" modem/TNC and APRS encoder/decoder. It can
@@ -29,34 +40,64 @@ Linux AX25, SARTrack, RMS Express, and many others.
2940
%patch0 -p0
3041

3142
%build
32-
make -f Makefile.linux tocalls-symbols
33-
make %{?_smp_mflags} -f Makefile.linux
43+
44+
make -f Makefile.linux
45+
#make -f Makefile.linux tocalls-symbols
46+
make %{?_smp_mflags}
3447

3548

3649
%install
37-
make -f Makefile.linux install DESTDIR=$RPM_BUILD_ROOT
38-
make -f Makefile.linux install-conf DESTDIR=$RPM_BUILD_ROOT
50+
make install INSTALLDIR=$RPM_BUILD_ROOT/usr
51+
make install-conf INSTALLDIR=$RPM_BUILD_ROOT/usr
3952

4053
# Install icon
41-
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/
42-
cp dw-icon.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/
54+
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/direwolf/
55+
cp dw-icon.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/direwolf/
4356
mv symbols-new.txt ${RPM_BUILD_ROOT}%{_docdir}/%{name}/
4457
mv symbolsX.txt ${RPM_BUILD_ROOT}%{_docdir}/%{name}/
4558
mv tocalls.txt ${RPM_BUILD_ROOT}%{_docdir}/%{name}/
4659
desktop-file-install \
4760
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications direwolf.desktop
61+
#temp bug
62+
#non echo "fixing $RPM_BUILD_ROOT/%{_bindir}/bin"
63+
#non rm -f $RPM_BUILD_ROOT/usr/bin
4864

4965

5066
%files
5167
%{_sysconfdir}/ax25/direwolf.conf
68+
%{_sysconfdir}/ax25/sdr.conf
69+
%{_sysconfdir}/ax25/telemetry-toolkit/telem-balloon.conf
70+
%{_sysconfdir}/ax25/telemetry-toolkit/telem-m0xer-3.txt
71+
%{_sysconfdir}/ax25/telemetry-toolkit/telem-volts.conf
72+
%{_sysconfdir}/udev/rules.d/99-direwolf-cmedia.rules
5273
%{_bindir}/*
53-
%{_datadir}/pixmaps/dw-icon.png
74+
%{_datadir}/pixmaps/direwolf/dw-icon.png
5475
%{_datadir}/applications/%{name}.desktop
5576
%{_datadir}/direwolf/*
56-
%{_docdir}/%{name}/*
77+
%{_docdir}/*
78+
%{_mandir}/man1/*
5779

5880

5981

6082
%changelog
83+
* Sat Dec 16 2017 David Ranch <dranch@trinnet.net> - 1.5-1
84+
- New 1.5-Beta version from Git
85+
* Sun Apr 2 2017 David Ranch <dranch@trinnet.net> - 1.4-1
86+
- New 1.4-Beta1 version from Git
87+
* Sun Mar 5 2017 David Ranch <dranch@trinnet.net> - 1.4-1
88+
- New 1.4-H Alpha version from Git version
89+
* Fri Aug 26 2016 David Ranch <dranch@trinnet.net> - 1.4-1
90+
- New version
91+
* Fri May 06 2016 David Ranch <dranch@trinnet.net> - 1.3-1
92+
- New version
93+
* Sat Sep 12 2015 David Ranch <dranch@trinnet.net> - 1.3F-1
94+
- New version with new features
95+
* Sun May 10 2015 David Ranch <dranch@trinnet.net> - 1.2E-1
96+
- New version that supports a PASSALL function
97+
- Updated the Makefile.linux patch
98+
* Sat Mar 21 2015 David Ranch <dranch@trinnet.net> - 1.2C-1
99+
- changed to support different make installation variable
100+
* Sat Feb 14 2015 David Ranch <dranch@trinnet.net> - 1.2b-1
101+
- new spec file
61102
* Sat Dec 20 2014 David Ranch <dranch@trinnet.net> - 1.1b1-1
62103
- new spec file

0 commit comments

Comments
 (0)