something something fixing branches
This commit is contained in:
@@ -26,8 +26,9 @@ FROM farpn-base AS rigctld-builder
|
|||||||
|
|
||||||
>>>>>>> d078273 (moved dockerfile for rigctld, added config stubs)
|
>>>>>>> d078273 (moved dockerfile for rigctld, added config stubs)
|
||||||
RUN <<EOF
|
RUN <<EOF
|
||||||
|
mkdir src
|
||||||
cd src
|
cd src
|
||||||
git clone https://github.com/Hamlib/Hamlib.git
|
git clone --branch 4.6.5 --single-branch https://github.com/Hamlib/Hamlib.git
|
||||||
cd Hamlib
|
cd Hamlib
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
./bootstrap
|
./bootstrap
|
||||||
@@ -37,8 +38,8 @@ EOF
|
|||||||
|
|
||||||
=======
|
=======
|
||||||
mkdir build; cd build
|
mkdir build; cd build
|
||||||
./bootstrap
|
../bootstrap
|
||||||
./configure --prefix=/usr/local
|
../configure --prefix=/usr/local
|
||||||
make clean
|
make clean
|
||||||
make
|
make
|
||||||
make install
|
make install
|
||||||
|
|||||||
Reference in New Issue
Block a user